瀏覽代碼

用户分机号

1550076451 2 年之前
父節點
當前提交
57c012b7d9

+ 11 - 0
zxkf-api/src/main/java/api/controller/IndexController.java

6
 import api.entity.database.Report.HourReport;
6
 import api.entity.database.Report.HourReport;
7
 import api.entity.database.Report.Report;
7
 import api.entity.database.Report.Report;
8
 import api.entity.database.order.WorkOrderBase;
8
 import api.entity.database.order.WorkOrderBase;
9
+import api.entity.database.system.UserExtension;
9
 import api.service.call.IRecordService;
10
 import api.service.call.IRecordService;
10
 import api.service.online.IMessageService;
11
 import api.service.online.IMessageService;
11
 import api.service.order.IReportBaseService;
12
 import api.service.order.IReportBaseService;
49
 
50
 
50
     @Autowired
51
     @Autowired
51
     private IReportBaseService ReportBaseService;
52
     private IReportBaseService ReportBaseService;
53
+    @Autowired
54
+    private IUserExtensionService userextensionService;
52
 
55
 
53
     /**
56
     /**
54
      * 获取用户信息
57
      * 获取用户信息
75
         LambdaQueryWrapper<Dept> dept = new LambdaQueryWrapper<>();
78
         LambdaQueryWrapper<Dept> dept = new LambdaQueryWrapper<>();
76
         dept.eq(Dept::getDeptId, user.getDeptId());
79
         dept.eq(Dept::getDeptId, user.getDeptId());
77
 
80
 
81
+        LambdaQueryWrapper<UserExtension> qw = new LambdaQueryWrapper<>();
82
+        qw.eq (UserExtension::getUsercode,user.getUserName() );
83
+        UserExtension entity = userextensionService.getEntity(qw);
84
+
78
         user.setDept(deptService.getEntity(dept));
85
         user.setDept(deptService.getEntity(dept));
79
         map.put("user", user);
86
         map.put("user", user);
80
         map.put("roles", roles);
87
         map.put("roles", roles);
81
         map.put("permissions", perms);
88
         map.put("permissions", perms);
89
+        if (entity!=null)
90
+        {
91
+            user.setExtension(entity.getExtension());
92
+        }
82
         return Success("成功", map);
93
         return Success("成功", map);
83
     }
94
     }
84
 
95
 

+ 6 - 0
zxkf-api/src/main/java/api/controller/system/UserController.java

1
 package api.controller.system;
1
 package api.controller.system;
2
 
2
 
3
+import api.entity.database.system.UserExtension;
4
+import api.entity.view.call.CallLogView;
5
+import api.service.system.IUserExtensionService;
3
 import api.util.annotation.Anonymous;
6
 import api.util.annotation.Anonymous;
7
+import com.alibaba.fastjson2.JSON;
4
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
8
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
9
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
10
 import com.baomidou.mybatisplus.core.metadata.IPage;
35
     public StringRedisTemplate stringRedisTemplate;
39
     public StringRedisTemplate stringRedisTemplate;
36
     @Autowired
40
     @Autowired
37
     private IUserService userService;
41
     private IUserService userService;
42
+
38
     @Autowired
43
     @Autowired
39
     private IDeptService deptService;
44
     private IDeptService deptService;
40
     @Autowired
45
     @Autowired
73
         if (user == null) {
78
         if (user == null) {
74
             return Error("用户不存在");
79
             return Error("用户不存在");
75
         }
80
         }
81
+
76
         return Success("成功", user);
82
         return Success("成功", user);
77
     }
83
     }
78
 
84
 

+ 5 - 2
zxkf-api/src/main/java/api/controller/system/UserExtensionController.java

55
     @ApiOperation("详情")
55
     @ApiOperation("详情")
56
     @Log(title = "查询sys_user_extension详情",businessType = BusinessType.QUERY)
56
     @Log(title = "查询sys_user_extension详情",businessType = BusinessType.QUERY)
57
     @GetMapping("/{id}")
57
     @GetMapping("/{id}")
58
-    public AjaxResult getInfo(@PathVariable long id) {
59
-        return Success("成功", userextensionService.getEntity(id));
58
+    public AjaxResult getInfo(@PathVariable String  userCode) {
59
+        LambdaQueryWrapper<UserExtension> qw = new LambdaQueryWrapper<>();
60
+        qw.eq (UserExtension::getUsercode,userCode );
61
+
62
+        return Success("成功", userextensionService.getEntity(qw));
60
     }
63
     }
61
 
64
 
62
     @ApiOperation("新增")
65
     @ApiOperation("新增")

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

17
 
17
 
18
     /** 角色组 */
18
     /** 角色组 */
19
     private List<Long> roleIds;
19
     private List<Long> roleIds;
20
+
21
+    private String extension;
20
 }
22
 }