feat: 标签

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

@@ -19,6 +19,7 @@ import com.zrqx.resource.exception.ResourceBizException;
 import com.zrqx.resource.mapper.label.LabelContentDiyTypeMapper;
 import com.zrqx.resource.mapper.label.LabelDataTypeMapper;
 import com.zrqx.resource.mapper.label.LabelMapper;
+import com.zrqx.resource.model.enums.DiyTypeStatusEnum;
 import com.zrqx.resource.model.form.label.LabelDataTypeForm;
 import com.zrqx.resource.model.form.label.QueryLabelListForm;
 import com.zrqx.resource.model.form.label.SaveUpdateLabelForm;
@@ -71,19 +72,24 @@ 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<>();
         ObjectMapper mapper1 = new ObjectMapper();
         String jsonString = systemAdminClient.infoJson(Integer.parseInt(tokenManager.getUserId()));
         try {
             SystemAdmin systemAdmin = mapper1.readValue(jsonString, SystemAdmin.class);
-            if (systemAdmin != null && !systemAdmin.getDepartmentCode().equals("0")) {
+            if (systemAdmin != null && !systemAdmin.getDepartmentCode().equals("01")) {
                 if (systemAdmin.getRoles().contains(",")) {
                     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");
                         departmentCode=systemAdmin.getDepartmentCode();
                     }
                 }else{
                     if (!systemAdmin.getRoles().equals("1")) {
+                        labelLambdaQueryWrapper.like(Label::getDepartmentCode,systemAdmin.getDepartmentCode());
+                        labelLambdaQueryWrapper.or().eq(Label::getDepartmentCode,"01");
                         departmentCode=systemAdmin.getDepartmentCode();
                     }
                 }