配置文件修改

PCS/src/main/java/cn/cslg/permission/common/model/vo/PersonnelVO.java

@@ -22,6 +22,7 @@ public class PersonnelVO extends BaseVO {
      * ID
      */
     private Integer id;
+    private  String guid;
 
     /**
      * Front:姓名

PCS/src/main/java/cn/cslg/permission/controller/SystemController.java

@@ -123,18 +123,6 @@ public class SystemController {
         return systemService.queryPersonPageList(personnelVO);
     }
 
-    @PostMapping("/getPersonnelByIds")
-    @Operation(summary = "根据id查询人员")
-    public String getPersonnelByIds(@RequestBody List<Integer> ids) {
-        return systemService.getPersonnelByIds(ids);
-    }
-
-    @GetMapping("getPersonIdByName")
-    @Operation(summary = "根据人员名称获得人员ID")
-    public List<Integer> getPersonIdByName(String personName,Boolean ifEqual) {
-        return systemService.getPersonIdByName(personName,ifEqual);
-    }
-
     @PostMapping("/getPersonIdByNames")
     @Operation(summary = "根据多个人员名称获得人员ID")
     public List<Integer> getPersonIdByNames(@RequestBody List<String> personNames) {
@@ -170,12 +158,24 @@ public class SystemController {
 
     }
 
+    @GetMapping("getPersonIdByName")
+    @Operation(summary = "根据人员名称获得人员ID")
+    public List<String> getPersonIdByName(String personName, Boolean ifEqual) {
+        return systemService.getPersonIdByName(personName, ifEqual);
+    }
+
     @GetMapping("/getPersonIdOrders")
     @Operation(summary = "查询人员id排序")
-    public List<Integer> getPersonIdOrders(Integer orderType) {
+    public List<String> getPersonIdOrders(Integer orderType) {
         return systemService.getPersonIdOrders(orderType);
     }
 
+    @PostMapping("/getPersonnelByIds")
+    @Operation(summary = "根据id查询人员")
+    public String getPersonnelByIds(@RequestBody List<String> ids) {
+        return systemService.getPersonnelByIds(ids);
+    }
+
     @PostMapping("/getClintByIds")
     @Operation(summary = "根据id查询客户")
     public String getClintByIds(@RequestBody List<Integer> ids) {
@@ -191,7 +191,7 @@ public class SystemController {
 
     @GetMapping("getClientIdByName")
     @Operation(summary = "根据客户名称获得人客户ID")
-    public List<Integer> getClientIdByName(String clientName,Boolean ifEqual) {
-        return systemService.getClientIdByName(clientName,ifEqual);
+    public List<Integer> getClientIdByName(String clientName, Boolean ifEqual) {
+        return systemService.getClientIdByName(clientName, ifEqual);
     }
 }

PCS/src/main/java/cn/cslg/permission/domain/Personnel.java

@@ -18,6 +18,14 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "PERSONNEL")
 public class Personnel extends BaseEntity<Personnel> {
+
+
+    /**
+     * 人员账号
+     */
+    @TableField(value = "GUID")
+    private String guid;
+
     /**
      * 人员账号
      */

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -125,7 +125,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         }
 
         //Sa-token 登录方法 登录后 生成Token 如果集成了Redis的话 会自动存入Redis
-        StpUtil.login(personnel.getId());
+        StpUtil.login(personnel.getGuid());
         //填充数据
         PersonnelVO personnelVO = this.pushData(personnel);
         //将用户信息数据存入Redis
@@ -173,6 +173,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO
                 .setId(personnel.getId())
+                .setGuid(personnel.getGuid())
                 .setEmail(personnel.getPersonnelEmail())
                 .setQqNumber(personnel.getPersonnelQQ())
                 .setNail(personnel.getPersonnelDing())

PCS/src/main/java/cn/cslg/permission/service/SystemService.java

@@ -209,7 +209,7 @@ public class SystemService {
      * @title 根据id查询人员
      * @description 获取所有的人员 不分租户
      */
-    public List<Integer> getPersonIdByName(String personName,Boolean ifEqual) {
+    public List<String> getPersonIdByName(String personName,Boolean ifEqual) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Personnel::getId);
         if(ifEqual!=null&&ifEqual.equals(true)) {
@@ -218,8 +218,8 @@ public class SystemService {
         else {
             queryWrapper.eq(Personnel::getPersonnelName, personName);
         }
-        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
-        List<Integer> ids = personnelService.listObjs(queryWrapper, f);
+        java.util.function.Function<Object, String> f = (o -> o.toString());
+        List<String> ids = personnelService.listObjs(queryWrapper, f);
         return ids;
     }
 
@@ -234,11 +234,11 @@ public class SystemService {
         return ids;
     }
 
-    public String getPersonnelByIds(List<Integer> ids) {
+    public String getPersonnelByIds(List<String> ids) {
         List<Personnel> personnelList = new ArrayList<>();
         if (ids != null && ids.size() > 0) {
             LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(Personnel::getId, ids);
+            queryWrapper.in(Personnel::getGuid, ids);
             personnelList = personnelService.list(queryWrapper);
         }
         return Response.success(personnelList);
@@ -329,17 +329,17 @@ public class SystemService {
      * @param orderType
      * @return
      */
-    public List<Integer> getPersonIdOrders(Integer orderType) {
+    public List<String> getPersonIdOrders(Integer orderType) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Personnel::getId);
+        queryWrapper.select(Personnel::getGuid);
         if(orderType.equals(0)){
             queryWrapper.orderByAsc(Personnel::getPersonnelName);
         }
         else{
             queryWrapper.orderByDesc(Personnel::getPersonnelName);
         }
-        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
-        List<Integer> ids = personnelService.listObjs(queryWrapper, f);
+        java.util.function.Function<Object, String> f = (o ->o.toString());
+        List<String> ids = personnelService.listObjs(queryWrapper, f);
         return ids;
     }