Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -708,7 +708,9 @@ public class WorkOrderManageController {
                     }
                 }
                 Long[] ids = idList.toArray(new Long[0]);
-                Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
+                List<UserEntity> userEntityList=userCenterClient.findUserIdsByUserIds(ids);
+                Map<Long,String> userMap = userEntityList.stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
+                Map<Long,String> userPhoneMap = userEntityList.stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getPhone));
                 Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
                 for(int i = 0; i < result.size(); i++) {
                     WorkOrderManageDto workOrder = result.get(i);
@@ -721,6 +723,7 @@ public class WorkOrderManageController {
                         }
                         if (workOrder.getOrderUserId() != null) {
                             workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
+                            workOrder.setOrderUserPhone(userPhoneMap.get(Long.valueOf(workOrder.getOrderUserId())));
                         }
                         if (workOrder.getCreateBy() != null) {
                             workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -83,4 +83,7 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "工作流日志集合")
     List<WorkFlowLog> workFlowLogList;
+
+    @ApiModelProperty(value = "接单人电话")
+    private String orderUserPhone;
 }

user_center/src/main/java/com/huaxu/dao/UserMapper.java

@@ -38,7 +38,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     List<UserEntity> findUserList(@Param("user")UserEntity userEntity);
 
-    List<UserEntity> findUserIdsForOrg(@Param("compayId")Integer compayId, @Param("deptId")Integer deptId,@Param("ids")List<Long> ids);
+    List<UserEntity> findUserIdsForOrg(@Param("compayId")Integer compayId, @Param("deptId")Integer deptId,@Param("ids")List<Long> ids,@Param("compids")List<Long> comIds);
 
 
 

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -349,13 +349,21 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 		String ids = "";
 		if (deptId != null)
 			ids = orgMapper.findParentOrgByChildId(deptId);
+		//查询公司
+		String comps = orgMapper.findParentOrgByChildId(compayId);
+		String[] compids = comps.split(",");
+		List<Long> compList = new ArrayList<>();
+		for (String item : compids) {
+			if (!item.equals(compayId.toString()))
+				compList.add(Long.valueOf(item));
+		}
+
 		List<Long> idList = new ArrayList<>();
 		String[] as = ids.split(",");
-		for(String item : as)
-		{
+		for (String item : as) {
 			idList.add(Long.valueOf(item));
 		}
-		List<UserEntity> list = userMapper.findUserIdsForOrg(compayId, deptId, idList);
+		List<UserEntity> list = userMapper.findUserIdsForOrg(compayId, deptId, idList,compList);
 		return list;
 	}
 	public List<Integer> findUserIdsByPermissonOrg(String tenantId,Integer companyOrgId,Integer deptOrgId){

user_center/src/main/resources/mapper/UserMapper.xml

@@ -222,21 +222,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="sysAreaJoins"/>
         where a.status=1
         <if test="compayId != null and compayId != '' and deptId != null and deptId != ''">
-            and (
+            and ((
                a.COMPANY_ORG_ID = #{compayId}
                 <if test="deptId != null and deptId != ''">
-                   and a.DEPT_ORG_ID in
+                   and (a.DEPT_ORG_ID in
                     <foreach collection="ids" item="item" open="(" close=")" separator=",">
                         #{item}
-                    </foreach>
+                    </foreach> or a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
                 </if>
             )
+           or(
+                a.COMPANY_ORG_ID in
+                <foreach collection="compids" item="item" open="(" close=")" separator=",">
+                  #{item}
+                </foreach>
+            )
+            )
         </if>
         <if test="compayId != null and compayId != '' and (deptId == null or deptId ==0 )">
             and (
+            (
                 a.COMPANY_ORG_ID = #{compayId}
                 and (a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
             )
+            or(
+                a.COMPANY_ORG_ID in
+                    <foreach collection="compids" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                )
+            )
         </if>
     </select>