量表添加调整和组织下人员查询调整

src/main/java/com/rf/psychological/institution/service/impl/InstitutionAuthServiceImpl.java

@@ -95,7 +95,6 @@ public class InstitutionAuthServiceImpl implements InstitutionAuthService {
 
     @Override
     public void saveAllInstitutionNoAuth(String institutionNo, String type) {
-        GroupEntity groupEntity = this.groupInfoRepository.findByInstitutionNoAndGroupName(institutionNo, Constant.DEFAULT_GROUP_NAME);
         List<InstitutionAuthEntity> institutionAuthEntityList = new ArrayList<>();
         List<GroupAuthEntity> list = new ArrayList<>();
         if (type.equals("0")) {
@@ -113,21 +112,13 @@ public class InstitutionAuthServiceImpl implements InstitutionAuthService {
                     institutionAuthEntity.setBId(item.getId());
                     institutionAuthEntity.setType(type);
                     institutionAuthEntityList.add(institutionAuthEntity);
-
-                    GroupAuthEntity entry = new GroupAuthEntity();
-                    entry.setBId(item.getId());
-                    entry.setGroupId(groupEntity.getId());
-                    entry.setType(type);
-                    list.add(entry);
                 });
 
 
             }
             if(institutionAuthEntityList.size()>0)
                 this.institutionAuthRepository.saveAll(institutionAuthEntityList);
-            if(list.size()>0){
-                this.groupAuthRepository.saveAll(list);
-            }
+
         }
         if (type.equals("1")) {
             Page<CognitiveTaskEntity> institutionNoCTAuthList = cognitiveTaskRepository.findInstitutionNoCTAuthList(institutionNo, "", PageRequest.of(0, 1));
@@ -141,12 +132,7 @@ public class InstitutionAuthServiceImpl implements InstitutionAuthService {
                 institutionNoCTAuthList1.getContent().forEach(item ->{
                     InstitutionAuthEntity institutionAuthEntity = new InstitutionAuthEntity(institutionNo, item.getId(), type);
                     institutionAuthEntityList.add(institutionAuthEntity);
-                    GroupAuthEntity groupAuthEntity = new GroupAuthEntity();
-                    groupAuthEntity.setBId(item.getId());
-                    groupAuthEntity.setGroupId(groupEntity.getId());
-                    groupAuthEntity.setType(type);
-                    list.add(groupAuthEntity);
-                    groupAuthRepository.save(groupAuthEntity);
+
                 });
                 if(institutionAuthEntityList.size()>0){
                     this.institutionAuthRepository.saveAll(institutionAuthEntityList);

src/main/java/com/rf/psychological/user/service/impl/UserServiceImpl.java

@@ -342,10 +342,8 @@ public class UserServiceImpl implements UserService {
         Specification specification = (Specification<UserEntity>) (root, query, cb) -> {
             List<Predicate> list = new ArrayList<>();
             list.add(cb.equal(root.get("institutionNo"),institutionNo));
-            list.add(cb.equal(root.get("structureNo"),structureNo));
+            list.add(cb.like(root.get("structureNo"),structureNo+"%"));
             query.where(cb.and(list.toArray(new Predicate[list.size()])));
-            //排序的升序和倒叙的写法
-            //query.orderBy(cb.desc(root.get("id")));
             return query.getRestriction();
         };
         Page<UserEntity> result = userRepository.findAll(specification, PageRequestUtil.of(pageNum , pageSize));