傅行帆 3 years ago
parent
commit
d2ab4e00a1

+ 7
- 7
src/main/java/com/yunzhi/marketing/xlk/controller/InstitutionController.java View File

61
         try {
61
         try {
62
             LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
62
             LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
63
             queryWrapper.eq(Institution::getOrgId,getOrgId(request));
63
             queryWrapper.eq(Institution::getOrgId,getOrgId(request));
64
-            if (StringUtils.isEmpty(institutionCode)){
65
-                queryWrapper.eq(Institution::getType,1);
66
-            }else {
67
-                Institution institution = iInstitutionService.getById(institutionCode);
68
-                queryWrapper.eq(Institution::getType,institution.getType() + 1);
69
-                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
70
-            }
64
+//            if (StringUtils.isEmpty(institutionCode)){
65
+//                queryWrapper.eq(Institution::getType,1);
66
+//            }else {
67
+//                Institution institution = iInstitutionService.getById(institutionCode);
68
+//                queryWrapper.eq(Institution::getType,institution.getType() + 1);
69
+//                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
70
+//            }
71
             queryWrapper.orderByDesc(Institution::getCreateDate);
71
             queryWrapper.orderByDesc(Institution::getCreateDate);
72
 
72
 
73
             List<Institution> list = iInstitutionService.list(queryWrapper);
73
             List<Institution> list = iInstitutionService.list(queryWrapper);

+ 0
- 1
src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java View File

33
     /**
33
     /**
34
      * 组织代码
34
      * 组织代码
35
      */
35
      */
36
-    @NotBlank(message = "组织代码不能为空")
37
     private String institutionId;
36
     private String institutionId;
38
 }
37
 }