menu

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -71,9 +71,6 @@ public class MenuController {
     @GetMapping("/tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
     public R menuTree(@Valid MenuTreeDto dto) {
-        if (StrUtil.isEmpty(dto.getSystemType())) {
-            dto.setSystemType(SystemTypeEnum.SYSTEMPC.getCode());
-        }
         List<MenuVo> list = menuService.getAuthMenuList(dto);
         List<MenuTreeVo> voList = BeanUtil.copyToList(list, MenuTreeVo.class);
         List<MenuTreeVo> treeVoList = TreeUtil.build(voList);
@@ -84,9 +81,6 @@ public class MenuController {
     @GetMapping("/quick")
     @ApiOperation(value = "用户快捷菜单")
     public RT<List<MenuVo>> quick(@Valid MenuTreeDto dto) {
-        if (StrUtil.isEmpty(dto.getSystemType())) {
-            dto.setSystemType(SystemTypeEnum.SYSTEMPC.getCode());
-        }
         List<Menu> menus = menuService.getUserQuick(dto);
         List<MenuVo> menuListVos = BeanUtil.copyToList(menus, MenuVo.class);
         return RT.ok(menuListVos);
@@ -95,9 +89,6 @@ public class MenuController {
     @GetMapping("/role-serve")
     @ApiOperation(value = "查询角色菜单服务")
     public RT<List<MenuServeVo>> roleMenuServe(RoleMenuServeListDto dto) {
-        if (StrUtil.isEmpty(dto.getSystemType())) {
-            dto.setSystemType(SystemTypeEnum.SYSTEMPC.getCode());
-        }
         List<MenuServeVo> list = menuService.getRoleMenuServe(dto);
 
         return RT.ok(list);

src/main/java/com/xjrsoft/module/system/dto/AddMenuDto.java

@@ -67,7 +67,7 @@ public class AddMenuDto implements Serializable {
 
     @NotNull(message = "系统类型不能为空!")
     @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
-    private Integer systemType;
+    private String systemType;
 
     @Range(min = 0,max = 1,message = "菜单显示或者隐藏只能是0 或者 1！")
     @ApiModelProperty("菜单显示或者隐藏")

src/main/java/com/xjrsoft/module/system/dto/RoleMenuServeListDto.java

@@ -14,5 +14,6 @@ public class RoleMenuServeListDto {
     private Long roleId;
 
     @Length(max = 20,message = "系统类型！")
+    @NotNull(message = "系统类型code不能为空")
     private String systemType;
 }

src/main/java/com/xjrsoft/module/system/dto/UpdateMenuDto.java

@@ -70,7 +70,7 @@ public class UpdateMenuDto implements Serializable {
 
     @NotNull(message = "系统类型不能为空!")
     @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
-    private Integer systemType;
+    private String systemType;
 
     @Range(min = 0,max = 1,message = "菜单显示或者隐藏只能是0 或者 1！")
     @ApiModelProperty("菜单显示或者隐藏")

src/main/java/com/xjrsoft/module/system/entity/Menu.java

@@ -66,7 +66,7 @@ public class Menu extends AuditEntity implements Serializable {
     private Integer menuType;
 
     @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
-    private Integer systemType;
+    private String systemType;
 
     @ApiModelProperty("菜单显示或者隐藏")
     private Integer display;

src/main/java/com/xjrsoft/module/system/vo/MenuVo.java

@@ -47,7 +47,7 @@ public class MenuVo implements Serializable {
     private Integer componentType;
 
     @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
-    private Integer systemType;
+    private String systemType;
 
     @ApiModelProperty("外链地址 ")
     private String iframeSrc;

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -21,7 +21,7 @@
         left join xjr_user t5 on t.assessment_user_id=t5.id
         left join xjr_dictionary_detail t6 on t6.code=t.score_type
         where  t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0 and t.status=1
-        <if test="dto.projectIds != null">
+        <if test="dto.projectIds != null and dto.projectIds.size()>0">
             and t.base_student_assessment_project_id in
             <foreach item="projectId" index="index" collection="dto.projectIds" open="(" close=")" separator=",">
                 #{projectId}
@@ -75,7 +75,7 @@
         <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
             #{classId}
         </foreach>
-        <if test="dto.projectIds != null">
+        <if test="dto.projectIds != null and dto.projectIds.size()>0">
             and t1.base_student_assessment_project_id in
             <foreach item="projectId" index="index" collection="dto.projectIds" open="(" close=")" separator=",">
                 #{projectId}