接口调整

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@ import com.njcn.device.pq.api.PqsTerminalLogsClient;
 import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.pojo.bo.BaseLineProExcelBody;
+import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -35,6 +36,7 @@ import com.njcn.user.pojo.constant.UserType;
 import com.njcn.user.pojo.dto.UserDTO;
 import com.njcn.user.pojo.dto.excel.UserExcel;
 import com.njcn.user.pojo.param.UserParam;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.po.UserSet;
 import com.njcn.user.pojo.po.UserStrategy;
@@ -83,6 +85,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     private final PqsTerminalLogsClient pqsTerminalLogsClient;
 
+    private final AreaFeignClient areaFeignClient;
+
     @Override
     public UserDTO getUserByName(String loginName) {
         User user = getUserByLoginName(loginName);
@@ -236,6 +240,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return null;
         }
         BeanUtil.copyProperties(user, userVO);
+        Dept dept = deptService.getDeptById(user.getDeptId());
+        //非自定义部门
+        if (Objects.equals(dept.getType(),0)){
+            String areaId = deptService.getAreaIdByDeptId(user.getDeptId());
+            userVO.setAreaId(areaId);
+            userVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
+        } else {
+            userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
+        }
         userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
         userVO.setRoleList(roleService.getIdByUserId(id));
         userVO.setRole(roleService.getNameByUserId(id));