Merge remote-tracking branch 'origin/master'

@@ -435,18 +435,18 @@ public class SysDepartController {
      * @return
      */
     @RequestMapping(value = "/queryDeptAndEmpTreeList", method = RequestMethod.GET)
-    public Result<List<TreeData>> queryDeptAndEmpTreeList(String departId) {
+    public Result<List<TreeData>> queryDeptAndEmpTreeList(String departId,String roleId) {
         //根据token获取该用户厂id
-        departId = BaseContextHandler.getRealDepartId();
-        String orgType = ConvertUtils.getString(BaseContextHandler.get("orgType"));
-        if (!StringUtils.isEmpty(orgType)) {
+//        departId = BaseContextHandler.getRealDepartId();
+//        String orgType = ConvertUtils.getString(BaseContextHandler.get("orgType"));
+        if (StringUtils.isEmpty(departId)) {
             departId = ConvertUtils.getString(BaseContextHandler.getRealDepartId());
         }
         //获取数据列表
-        List<SysDeptUserVO> list = sysDepartService.queryDeptAndEmpTreeList(departId);
+        List<SysDeptUserVO> list = sysDepartService.queryDeptAndEmpTreeList(departId,roleId);
         //将业务数据转换为构造树所需的数据结构
         List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
-        List<TreeData> treeList = TreeUtils.buildTree(transTreeModels, departId);
+        List<TreeData> treeList = TreeUtils.buildTreeForParentId(transTreeModels, departId);
         Result<List<TreeData>> result = new Result<>();
         try {
             result.setResult(treeList);
@@ -464,6 +464,9 @@ public class SysDepartController {
      */
     @RequestMapping(value = "/queryDeptAndUserTreeList", method = RequestMethod.GET)
     public Result<List<TreeData>> queryDeptAndUserTreeList(String departId,String userType) {
+        if (StringUtils.isEmpty(departId)) {
+            departId = ConvertUtils.getString(BaseContextHandler.getRealDepartId());
+        }
         //获取数据列表
         List<SysDeptUserVO> list = sysDepartService.queryDeptAndUserTreeList(departId,userType);
         //将业务数据转换为构造树所需的数据结构
@@ -494,7 +497,7 @@ public class SysDepartController {
 //    	}
         departId = "c6d7cb4deeac411cb3384b1b31278596";
         //获取数据列表
-        List<SysDeptUserVO> list = sysDepartService.queryDeptAndEmpTreeList(departId);
+        List<SysDeptUserVO> list = sysDepartService.queryDeptAndEmpTreeList(departId,null);
         //将业务数据转换为构造树所需的数据结构
         List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
         List<TreeData> treeList = TreeUtils.buildTree(transTreeModels, departId);

@@ -35,7 +35,7 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
      * @return
      * @author Li Yuanyuan, 2020年8月31日 上午9:52:46
      */
-    public List<SysDeptUserVO> queryDeptAndEmpTreeList(@Param("departId") String departId);
+    public List<SysDeptUserVO> queryDeptAndEmpTreeList(@Param("departId") String departId,@Param("roleId") String roleId);
 
     /**
      * 获取厂区树

@@ -44,9 +44,14 @@
 					FROM
 						sys_user a
 					INNER JOIN sys_user_depart b ON a.id = b.user_id
+					LEFT JOIN sys_user_role r ON a.id = r.user_id
 					WHERE
 						a.is_system_user = '0'
 						and a.del_flag = '0'
+						<if test="roleId!='' and roleId!=null">
+							and r.role_id = #{roleId}
+						</if>
+					group by b.user_id
 			) aa
 		ORDER BY
 			depart_type,

@@ -90,7 +90,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * 	获取机构人员树结构列表
      * @return
      */
-	List<SysDeptUserVO> queryDeptAndEmpTreeList(String departId);
+	List<SysDeptUserVO> queryDeptAndEmpTreeList(String departId,String roleId);
 
 	List<SysDeptUserVO> queryFactoryTreeList();
 

@@ -363,8 +363,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	}
 
 	@Override
-	public List<SysDeptUserVO> queryDeptAndEmpTreeList(String departId) {
-		return sysDepartMapper.queryDeptAndEmpTreeList(departId);
+	public List<SysDeptUserVO> queryDeptAndEmpTreeList(String departId, String roleId) {
+		return sysDepartMapper.queryDeptAndEmpTreeList(departId, roleId);
 	}
 
 	@Override