lixing 4 years ago
parent
commit
60cc25be8e

+ 6 - 7
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -117,8 +117,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
     /**
      * 账号关联项目
      *
-     * @param accountId  账号id
-     * @param projects 项目列表
+     * @param accountId 账号id
+     * @param projects  项目列表
      * @author lixing
      * @version V1.0 2021/3/26 5:23 下午
      */
@@ -567,7 +567,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
      * 判断账号关联的项目是否发生变化
      *
      * @param saasAccountProjects 账号之前关联的项目
-     * @param projects          更新后账号关联的项目
+     * @param projects            更新后账号关联的项目
      * @return 是否发生变化
      * @author lixing
      * @version V1.0 2021/4/8 9:40 上午
@@ -678,8 +678,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         List<WorkResume> workResumes = workResumeService.queryWorkResumeListByPersonIdList(Lists.newArrayList(personId));
         List<String> depIdsBeforeUpdate = workResumes.stream().map(WorkResume::getDepId).collect(Collectors.toList());
 
-        List<String> addedDepIds = ListUtil.getAddedList(depIdsAfterUpdate, depIdsBeforeUpdate);
-        List<String> deletedDepIds = ListUtil.getDeletedList(depIdsAfterUpdate, depIdsBeforeUpdate);
+        List<String> addedDepIds = ListUtil.getAddedList(depIdsBeforeUpdate, depIdsAfterUpdate);
+        List<String> deletedDepIds = ListUtil.getDeletedList(depIdsBeforeUpdate, depIdsAfterUpdate);
 
         workResumeService.updatePersonWorkResume(personId, addedDepIds, deletedDepIds);
     }
@@ -1101,8 +1101,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         }
         LambdaQueryWrapper<Person> personLambdaQueryWrapper = new LambdaQueryWrapper<>();
         personLambdaQueryWrapper.
-                //                apply(Person.PROP_PROFESSION + " like{0}", "%" + professionId + "%").
-                        like(Person::getProfession, "%" + professionId + "%").
+                like(Person::getProfession, "%" + professionId + "%").
                 eq(Person::getValid, ValidEnum.TRUE.getType());
         return list(personLambdaQueryWrapper);
     }

+ 0 - 8
fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java

@@ -126,14 +126,6 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
             throw new IllegalArgumentException("删除SaasRole时发生异常,找不到要删除的数据,id:" + id);
         }
 
-        // 如果角色和账号由关联,角色不可删除
-        QuerySaasAccountRoleDTO querySaasAccountRoleDTO = new QuerySaasAccountRoleDTO();
-        querySaasAccountRoleDTO.setRoleId(id);
-        List<SaasAccountRole> saasAccountRoles = saasAccountRoleService.querySaasAccountRoleList(querySaasAccountRoleDTO);
-        if (!CollectionUtils.isEmpty(saasAccountRoles)) {
-            throw new IllegalArgumentException("被引用的角色不可删除");
-        }
-
         return saasRole;
     }