1

src/main/java/com/yunzhi/marketing/xlk/controller/InstitutionController.java

@@ -61,13 +61,13 @@ public class InstitutionController extends BaseController {
         try {
             LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Institution::getOrgId,getOrgId(request));
-            if (StringUtils.isEmpty(institutionCode)){
-                queryWrapper.eq(Institution::getType,1);
-            }else {
-                Institution institution = iInstitutionService.getById(institutionCode);
-                queryWrapper.eq(Institution::getType,institution.getType() + 1);
-                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
-            }
+//            if (StringUtils.isEmpty(institutionCode)){
+//                queryWrapper.eq(Institution::getType,1);
+//            }else {
+//                Institution institution = iInstitutionService.getById(institutionCode);
+//                queryWrapper.eq(Institution::getType,institution.getType() + 1);
+//                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
+//            }
             queryWrapper.orderByDesc(Institution::getCreateDate);
 
             List<Institution> list = iInstitutionService.list(queryWrapper);

src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java

@@ -33,6 +33,5 @@ public class InstitutionDTO implements Serializable {
     /**
      * 组织代码
      */
-    @NotBlank(message = "组织代码不能为空")
     private String institutionId;
 }