Merge pull request '1.分权增加角色功能' (#277) from feature/cl into develop

Reviewed-on: #277

src/com/engine/organization/mapper/detach/ManagerDetachMapper.java

@@ -24,7 +24,7 @@ public interface ManagerDetachMapper {
 
     ManagerDetachPO getDetachById(@Param("id") Integer id);
 
-    List<ManagerDetachPO> getDetachListById(@Param("ecManager") Integer ecManager);
+    List<ManagerDetachPO> getDetachListById(@Param("ecManager") Integer ecManager,@Param("managerType") Integer managerType);
 
     List<ManagerDetachPO> selectDetachListByManager(@Param("ids") Collection<Integer> ids);
 

src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml

@@ -216,7 +216,7 @@
         from jcl_org_detach t
         WHERE delete_type = 0
         and ec_manager = #{ecManager}
-        and manager_type = 0
+        and manager_type = #{managerType}
     </select>
 
     <select id="selectDetachListByManager" resultMap="BaseResultMap">
@@ -225,7 +225,7 @@
         from jcl_org_detach t
         WHERE delete_type = 0
         and manager_type = 1
-        AND ec_manager IN
+        and ec_manager in
         <foreach collection="ids" open="(" item="id" separator="," close=")">
             #{id}
         </foreach>

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

@@ -75,7 +75,7 @@ public class FunctionOutStaffServiceImpl {
 
     private Integer frozenStaffNums(StaffOutParam param) {
         StaffPO staffPO = select(param);
-        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
+        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)

src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

@@ -155,7 +155,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         Integer ecManager = "0".equals(String.valueOf(param.getManagerType())) ? param.getEcManager() : param.getRoleId();
         String noRepeatRoleLevel = param.getEcRolelevel();
         // 判断有无重复数据
-        List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager);
+        List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager,param.getManagerType());
         if (CollectionUtils.isNotEmpty(detachListById)) {
             Set<String> noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById, param.getId());
             noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(",")));
@@ -184,7 +184,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         Integer ecManager = "0".equals(String.valueOf(param.getManagerType())) ? param.getEcManager() : param.getRoleId();
         String noRepeatRoleLevel = param.getEcRolelevel();
         // 判断有无重复数据
-        List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager);
+        List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager,param.getManagerType());
         if (CollectionUtils.isNotEmpty(detachListById)) {
             Set<String> noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById,param.getId());
             noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(",")));
@@ -249,19 +249,23 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         List<Integer> ecRoleLevels = new ArrayList<>();
         ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
         //人员
-        List<ManagerDetachPO> detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId));
+        List<ManagerDetachPO> detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId,0));
         //角色
         HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
-        //List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));
+        List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));
-        List<Integer> roleIds = Arrays.asList(69);
+        List<Integer> integerList  = roleIds.stream()
-        detachListById.addAll(mangeDetachMapper.selectDetachListByManager(roleIds));
+                .map(Integer::parseInt)
+                .collect(Collectors.toList());
+        detachListById.addAll(MapperProxyFactory.getProxy(ManagerDetachMapper.class).selectDetachListByManager(integerList));
         for (ManagerDetachPO managerDetachPO : detachListById) {
             List<Integer> ids = Stream.of(managerDetachPO.getJclRolelevel().split(",")).map(Integer::parseInt).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(ids)) {
                 ecRoleLevels.addAll(ids);
             }
         }
-        return ecRoleLevels;
+        return ecRoleLevels.stream()
+                .distinct() // 去除重复元素
+                .collect(Collectors.toList());
     }