Merge pull request '11' (#205) from feature/cl into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/205

src/com/engine/organization/entity/TreeData.java

@@ -21,5 +21,6 @@ public class TreeData {
     private String title;
     private String key;
     private Integer status;
+    private Integer schemeId;
     private ArrayList<TreeData> children;
 }

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

@@ -25,4 +25,6 @@ public interface ManagerDetachMapper {
     ManagerDetachPO getDetachById(@Param("id") Integer id);
 
     List<ManagerDetachPO> getDetachListById(@Param("ecManager") Integer ecManager);
+
+    ManagerDetachPO selectManagerDetachByUid(@Param("uid") Integer uId);
 }

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

@@ -217,4 +217,13 @@
         WHERE delete_type = 0
         and ec_manager = #{ecManager}
     </select>
+
+    <select id="selectManagerDetachByUid" resultMap="BaseResultMap">
+        select
+          <include refid="baseColumns"/>
+        from jcl_org_detach t
+        where delete_type = 0
+        and ec_manager = #{uid}
+    </select>
+
 </mapper>

src/com/engine/organization/mapper/scheme/SchemeMapper.java

@@ -98,4 +98,7 @@ public interface SchemeMapper {
     ArrayList<SchemeTreeData> getTreeData();
 
     List<SchemePO> getSchemesByIds(@Param("ids")Collection<Long> ids);
+
+
+    List<Integer> selectBySubcompanyId(@Param("subCompanyIds") Collection<Integer> subCompanyIds);
 }

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -266,4 +266,14 @@
         </foreach>
     </update>
 
+    <select id="selectBySubcompanyId" resultType="java.lang.Integer">
+        select id
+        from jcl_org_scheme
+        where delete_type = 0
+        AND subcompanyid IN
+        <foreach collection="subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
+            #{subCompanyId}
+        </foreach>
+    </select>
+
 </mapper>

src/com/engine/organization/service/ManagerDetachService.java

@@ -3,6 +3,7 @@ package com.engine.organization.service;
 import com.engine.organization.entity.detach.param.ManagerDetachParam;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -53,4 +54,14 @@ public interface ManagerDetachService {
      * @param isDetach
      */
     String doDetach(String isDetach);
+
+
+    /**
+     * @Description: 获取可管理的分部集合
+     * @Author: liang.cheng
+     * @Date: 2023/8/17 4:47 PM
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     */
+    List<Integer> selectManagerDetachByUid();
 }

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

@@ -176,6 +176,15 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         return new BaseBean().getPropValue("hrmOrganization", "detach");
     }
 
+    @Override
+    public List<Integer> selectManagerDetachByUid() {
+        ManagerDetachPO managerDetach = getMangeDetachMapper().selectManagerDetachByUid(user.getUID());
+        List<Integer> subCompanyIds = Arrays.stream(managerDetach.getEcRolelevel().split(","))
+                .map(Integer::parseInt)
+                .collect(Collectors.toList());
+        return subCompanyIds;
+    }
+
     private String buildSqlWhere(Map<String, Object> params) {
         DBType dbType = DBType.get(new RecordSet().getDBType());
         String sqlWhere = " where delete_type = 0";