配置文件修改

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

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

PCS/src/main/java/cn/cslg/permission/common/utils/DataUtils.java

@@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,4 +88,14 @@ public class DataUtils {
         Map<Object, Boolean> seen = new ConcurrentHashMap<>();
         return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
     }
+
+    public  static  List<Integer> StringToInteger(List<String> strings){
+        List<Integer> integers =new ArrayList<>();
+        strings.forEach(item->{
+            integers.add(Integer.parseInt(item));
+        });
+        return  integers;
+
+
+    }
 }

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

@@ -33,7 +33,7 @@ public class AccessCountService extends ServiceImpl<AccessCountMapper, AccessCou
         if(accessFrom != null && id != null && accessFrom > 0 && id > 0){
             //获取当前登陆人信息
             PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            Integer createId = personnelVO.getId();
+            Integer createId = Integer.parseInt(personnelVO.getId());
             LambdaQueryWrapper<AccessCount> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AccessCount::getCreateId, createId);
             queryWrapper.eq(AccessCount::getRangeId, id);

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

@@ -66,7 +66,7 @@ public class ApplicationService extends ServiceImpl<ApplicationMapper, Applicati
             application
                     .setApplicationName(applicationVO.getName())
                     .setApplicationDescription(applicationVO.getDescribe())
-                    .setCreateUser(personnelVO.getId());
+                    .setCreateUser(Integer.parseInt(personnelVO.getId()));
 
             application.insert();
             //新增关联数据

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

@@ -51,10 +51,9 @@ public class FunctionService extends ServiceImpl<FunctionMapper, Function> {
     @Transactional(rollbackFor = Exception.class)
     public String addFunction(FunctionVO functionVO) {
         log.info("开始处理【新增功能】的业务，参数为：{}", functionVO);
-
         //获取当前登录人信息，取出登陆人id
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        Integer createUser = personnelVO.getId();
+        Integer createUser = Integer.parseInt(personnelVO.getId());
 
         //根据功能标识和所属应用id查询功能表，判断功能标识是否已存在
         String modifyPath = functionVO.getSign();

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

@@ -172,8 +172,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         //填充数据
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO
-                .setId(personnel.getId())
-                .setGuid(personnel.getGuid())
+                .setId(personnel.getId().toString())
                 .setEmail(personnel.getPersonnelEmail())
                 .setQqNumber(personnel.getPersonnelQQ())
                 .setNail(personnel.getPersonnelDing())

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

@@ -172,14 +172,14 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
                 //人员表删除数据（逻辑删除）
                 Personnel personnel = new Personnel();
                 personnel.setIsDelete(1);
-                personnel.setId(personnelVO.getId());
+                personnel.setId(Integer.parseInt(personnelVO.getId()));
                 personnel.deleteById();
                 //人员与用户组关联表删除关联关系数据
-                personGroupService.delAssociatePerGroup(Collections.singletonList(personnelVO.getId()), null);
+                personGroupService.delAssociatePerGroup(Collections.singletonList(Integer.parseInt(personnelVO.getId())), null);
                 //人员与角色关联表删除关联关系数据
-                personRoleService.delAssociatePerRole(personnelVO.getId(), null);
+                personRoleService.delAssociatePerRole(Integer.parseInt(personnelVO.getId()), null);
                 //人员与部门与职位关联表删除关联关系数据
-                perDpService.deleteAssociatePerDp(personnelVO.getId(), null, null, null);
+                perDpService.deleteAssociatePerDp(Integer.parseInt(personnelVO.getId()), null, null, null);
                 return Response.success(true);
             }
         } catch (Exception e) {
@@ -226,7 +226,7 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
                     .setPersonnelStatus(personnelVO.getState())
                     .setPersonnelUserSex(personnelVO.getGender())
                     .setTenantId(personnelVO.getTenant())
-                    .setId(personnelVO.getId());
+                    .setId(Integer.parseInt(personnelVO.getId()));
 
             if (personnelVO.getPassword() != null) {
                 personnel.setPersonnelPassword(personnelVO.getPassword());
@@ -381,7 +381,7 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
             PersonnelVO personnelVO1 = new PersonnelVO();
             personnelVO1
                     .setUsername(personnel.getPersonnelUserName())
-                    .setId(personnel.getId())
+                    .setId(personnel.getId().toString())
                     .setGender(personnel.getPersonnelUserSex())
                     .setName(personnel.getPersonnelName())
                     .setEmail(personnel.getPersonnelEmail())

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

@@ -235,10 +235,12 @@ public class SystemService {
     }
 
     public String getPersonnelByIds(List<String> ids) {
+        //List<String>转id
+
         List<Personnel> personnelList = new ArrayList<>();
         if (ids != null && ids.size() > 0) {
             LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(Personnel::getGuid, ids);
+            queryWrapper.in(Personnel::getId, ids);
             personnelList = personnelService.list(queryWrapper);
         }
         return Response.success(personnelList);
@@ -331,7 +333,7 @@ public class SystemService {
      */
     public List<String> getPersonIdOrders(Integer orderType) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Personnel::getGuid);
+        queryWrapper.select(Personnel::getId);
         if(orderType.equals(0)){
             queryWrapper.orderByAsc(Personnel::getPersonnelName);
         }

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

@@ -218,7 +218,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
             PersonnelVO personnelVO1 = new PersonnelVO();
             personnelVO1.setUsername(tenantVO.getUsername());
             personnelVO1.setPassword(tenantVO.getPassword());
-            personnelVO1.setId(tenant.getPersonnelId());
+            personnelVO1.setId(tenant.getPersonnelId().toString());
             personnelService.updatePersonnel(personnelVO1);
 
             //修改关联客户

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

@@ -193,7 +193,7 @@ public class UserGroupService extends ServiceImpl<UserGroupMapper, UserGroup> {
                 PersonnelVO personnelVO = new PersonnelVO();
                 Personnel personnel = personnelService.getById(ugp.getPersonnelId());
 
-                personnelVO.setId(personnel.getId());
+                personnelVO.setId(personnel.getId().toString());
                 personnelVO.setName(personnel.getPersonnelName());
 
                 personnelVOS.add(personnelVO);
@@ -214,11 +214,13 @@ public class UserGroupService extends ServiceImpl<UserGroupMapper, UserGroup> {
             if (tenantService.getById(userGroup.getTenantId()) != null) {
                 tenantName = tenantService.getById(userGroup.getTenantId()).getTenantName();
             }
+            List<Integer> userIds =new ArrayList<>();
+            personnelVOS.forEach(item->{userIds.add(Integer.parseInt(item.getId()));});
             userGroupVO.setId(userGroup.getId())
                     .setRemark(userGroup.getUserGroupDescription())
                     .setName(userGroup.getUserGroupName())
                     .setUserList(personnelVOS)
-                    .setUsers(personnelVOS.stream().map(PersonnelVO::getId).collect(Collectors.toList()))
+                    .setUsers(userIds)
                     .setRole(roleVOS.stream().map(RoleVO::getId).collect(Collectors.toList()))
                     .setRoleList(roleVOS)
                     .setTenant(userGroup.getTenantId())

PCS/src/main/java/cn/cslg/permission/service/impl/UserFeedBackServiceImpl.java

@@ -39,7 +39,7 @@ public class UserFeedBackServiceImpl extends ServiceImpl<UserFeedBackMapper, Use
         log.info("开始处理【新增用户反馈】的业务，参数为：{}", userFeedbackAddNewDTO);
 
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        Integer createPersonId = personnelVO.getId();
+        Integer createPersonId = Integer.parseInt(personnelVO.getId());
         String createPersonName = personnelVO.getName();
 
         UserFeedback userFeedback = new UserFeedback();