用户分机号

zxkf-api/src/main/java/api/controller/IndexController.java

@@ -6,6 +6,7 @@ import api.entity.database.online.Message;
 import api.entity.database.Report.HourReport;
 import api.entity.database.Report.Report;
 import api.entity.database.order.WorkOrderBase;
+import api.entity.database.system.UserExtension;
 import api.service.call.IRecordService;
 import api.service.online.IMessageService;
 import api.service.order.IReportBaseService;
@@ -49,6 +50,8 @@ public class IndexController extends BaseController {
 
     @Autowired
     private IReportBaseService ReportBaseService;
+    @Autowired
+    private IUserExtensionService userextensionService;
 
     /**
      * 获取用户信息
@@ -75,10 +78,18 @@ public class IndexController extends BaseController {
         LambdaQueryWrapper<Dept> dept = new LambdaQueryWrapper<>();
         dept.eq(Dept::getDeptId, user.getDeptId());
 
+        LambdaQueryWrapper<UserExtension> qw = new LambdaQueryWrapper<>();
+        qw.eq (UserExtension::getUsercode,user.getUserName() );
+        UserExtension entity = userextensionService.getEntity(qw);
+
         user.setDept(deptService.getEntity(dept));
         map.put("user", user);
         map.put("roles", roles);
         map.put("permissions", perms);
+        if (entity!=null)
+        {
+            user.setExtension(entity.getExtension());
+        }
         return Success("成功", map);
     }
 

zxkf-api/src/main/java/api/controller/system/UserController.java

@@ -1,6 +1,10 @@
 package api.controller.system;
 
+import api.entity.database.system.UserExtension;
+import api.entity.view.call.CallLogView;
+import api.service.system.IUserExtensionService;
 import api.util.annotation.Anonymous;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,6 +39,7 @@ public class UserController extends BaseController {
     public StringRedisTemplate stringRedisTemplate;
     @Autowired
     private IUserService userService;
+
     @Autowired
     private IDeptService deptService;
     @Autowired
@@ -73,6 +78,7 @@ public class UserController extends BaseController {
         if (user == null) {
             return Error("用户不存在");
         }
+
         return Success("成功", user);
     }
 

zxkf-api/src/main/java/api/controller/system/UserExtensionController.java

@@ -55,8 +55,11 @@ public class UserExtensionController extends BaseController {
     @ApiOperation("详情")
     @Log(title = "查询sys_user_extension详情",businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
-    public AjaxResult getInfo(@PathVariable long id) {
-        return Success("成功", userextensionService.getEntity(id));
+    public AjaxResult getInfo(@PathVariable String  userCode) {
+        LambdaQueryWrapper<UserExtension> qw = new LambdaQueryWrapper<>();
+        qw.eq (UserExtension::getUsercode,userCode );
+
+        return Success("成功", userextensionService.getEntity(qw));
     }
 
     @ApiOperation("新增")

zxkf-entity/src/main/java/api/entity/view/system/UserView.java

@@ -17,4 +17,6 @@ public class UserView extends User {
 
     /** 角色组 */
     private List<Long> roleIds;
+
+    private String extension;
 }