feat: 标签

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/mapper/label/LabelMapper.java

@@ -24,9 +24,14 @@ public interface LabelMapper extends BaseMapper<Label> {
     @Select("<script>"
             + "SELECT a.id, a.name, a.englishName , a.createdTime,a.departmentName "
             + "FROM res_Label a  where 1=1 "
-            + "like(a.departmentCode,departmentCode)"
+            + "<if test='" + MapperConstants.NOT_BLANK + "(departmentCode1)' >"
+            + "like(a.departmentCode,departmentCode1)"
+            + "</if>"
+            + "<if test='" + MapperConstants.NOT_BLANK + "(departmentCode)' >"
+            + " and (a.departmentCode LIKE concat('%',#{departmentCode},'%')  or a.departmentCode='01')"
+            + "</if>"
             + "</script>")
-    List<LabelListVO> queryAll(@Param("departmentCode") String departmentCode);
+    List<LabelListVO> queryAll(@Param("departmentCode") String departmentCode,@Param("departmentCode1") String departmentCode1);
 
     /**
      * 通过标签id删除标签

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/LabelServiceImpl.java

@@ -72,8 +72,8 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
     public PageInfo<LabelListVO> page(String code,PageParam pageParam) {
         PageHelper.startPage(pageParam);
         String departmentCode =null;
-        LambdaQueryWrapper<Label> labelLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        labelLambdaQueryWrapper.ne(Label::getName,null);
+        String departmentCode1 =null;
+        //LambdaQueryWrapper<Label> labelLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ObjectMapper mapper1 = new ObjectMapper();
         String jsonString = systemAdminClient.infoJson(Integer.parseInt(tokenManager.getUserId()));
         try {
@@ -83,31 +83,31 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
                     List<String> list = Arrays.asList(systemAdmin.getRoles().split(","));
                     boolean b = list.stream().anyMatch(s -> s.equals("1"));
                     if (!b) {
-                        labelLambdaQueryWrapper.like(Label::getDepartmentCode,systemAdmin.getDepartmentCode());
-                        labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,"01");
+                        /*labelLambdaQueryWrapper.like(Label::getDepartmentCode,systemAdmin.getDepartmentCode());
+                        labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,"01");*/
                         departmentCode=systemAdmin.getDepartmentCode();
                     }
                 }else{
                     if (!systemAdmin.getRoles().equals("1")) {
-                        labelLambdaQueryWrapper.like(Label::getDepartmentCode,systemAdmin.getDepartmentCode());
-                        labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,"01");
+                        /*labelLambdaQueryWrapper.like(Label::getDepartmentCode,systemAdmin.getDepartmentCode());
+                        labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,"01");*/
                         departmentCode=systemAdmin.getDepartmentCode();
                     }
                 }
             }else{
                 if(StringUtils.isNotBlank(code)){
-                    departmentCode=code;
-                    labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,departmentCode);
+                    departmentCode1=code;
+                    /*labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,departmentCode);*/
                 }
             }
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
         //查询标签列表
-        //List<LabelListVO> listVO = labelMapper.queryAll(departmentCode);
-        List<LabelListVO> listVO = new ArrayList<>();
+        List<LabelListVO> listVO = labelMapper.queryAll(departmentCode,departmentCode1);
+  /*      List<LabelListVO> listVO = new ArrayList<>();
         List<Label> list = labelMapper.selectList(labelLambdaQueryWrapper);
-        BeanUtils.copyProperties(list, listVO);
+        BeanUtils.copyProperties(list, listVO);*/
         listVO.forEach(i -> {
             if (i != null) {
                 StringBuilder dataType = new StringBuilder();
@@ -137,7 +137,7 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
         String jsonString = systemAdminClient.infoJson(Integer.parseInt(tokenManager.getUserId()));
         try {
             systemAdmin = mapper1.readValue(jsonString, SystemAdmin.class);
-            if (systemAdmin != null && !systemAdmin.getDepartmentCode().equals("0")) {
+            if (systemAdmin != null) {
                 if (systemAdmin.getRoles().contains(",")) {
                     List<String> list = Arrays.asList(systemAdmin.getRoles().split(","));
                     boolean b = list.stream().anyMatch(s -> s.equals("1"));