修改4-27日脚本记录bug

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

@@ -38,16 +38,16 @@ public class RoleController {
     @PostMapping("/delete")
     @Operation(summary = "删除角色")
     public String deleteApplication(RoleVO roleVO) {
-        roleService.deleteRole(roleVO);
-        return Response.success(true);
+
+        return  roleService.deleteRole(roleVO);
     }
 
     @checkAuth(FunId = "/admin/role/modify")
     @PostMapping("/update")
     @Operation(summary = "修改角色")
     public String updateApplication(@RequestBody RoleVO roleVO) {
-        roleService.updateRole(roleVO);
-        return Response.success(true);
+  return roleService.updateRole(roleVO);
+
     }
 
     @checkAuth(FunId = "/admin/role/check")

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

@@ -104,13 +104,18 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
         wrapper.eq(Client::getName,client.getName());
         List<Client> clients =this.list(wrapper);
         if(clients.size()>0){
-            return  Response.error("该客户已存在");
+            client =clients.get(0);
+        }
+        else {
+            client.setCreateUser(loginUtils.getId());
+            client.setStatus(1);
+            client.insert();
         }
-        client.setCreateUser(loginUtils.getId());
-        client.setStatus(1);
-        client.insert();
         Integer tenantId = personnel.getTenantId();
-        assoTenantClientService.addTenantClient(client.getId(), tenantId);
+    Integer   flag =  assoTenantClientService.addTenantClient(client.getId(), tenantId);
+    if(flag<0){
+        return Response.error("客户已存在");
+    }
         return Response.success(client.getId());
     }
 

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

@@ -122,11 +122,11 @@ public class DataService extends ServiceImpl<DataMapper, Data> {
             if(function.getDefaultRule()!=null){
                 rules.add(function.getDefaultRule());
             }
-
             else {
             rules.add("0");}
             return rules;
         }
+
         List<JSONObject> jsonObjects = this.getJsonObjectById(loginId, functionId);
         for (JSONObject jsonObject : jsonObjects) {
             String tem = jsonObject.toJSONString();

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

@@ -139,16 +139,16 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
     @Transactional(rollbackFor = Exception.class)
     public String deletePersonnel(PersonnelVO personnelVO) {
         try {
-            Personnel personnel = new Personnel();
-            personnel.setIsDelete(1);
-            personnel.setId(personnelVO.getId());
-            personnel.deleteById();
             LambdaQueryWrapper<Tenant> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(Tenant::getPersonnelId, personnelVO.getId());
             Tenant tenant = tenantService.getOne(lambdaQueryWrapper);
             if (tenant != null) {
                 return Response.error("无法删除租户的管理员账号");
             } else {
+                Personnel personnel = new Personnel();
+                personnel.setIsDelete(1);
+                personnel.setId(personnelVO.getId());
+                personnel.deleteById();
                 personGroupService.delAssociatePerGroup(Collections.singletonList(personnelVO.getId()), null);
                 personRoleService.delAssociatePerRole(personnelVO.getId(), null);
                 perDpService.deleteAssociatePerDp(personnelVO.getId(), null, null, null);

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

@@ -43,14 +43,13 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
     @Transactional(rollbackFor = Exception.class)
     public String addPosition(PositionVO positionVO) {
         try {
-            if (positionVO.getIsmore() == 1) {
                 LambdaQueryWrapper<Position> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.eq(Position::getPositionName, positionVO.getPosition()).eq(Position::getTenantId, positionVO.getTenant());
+                lambdaQueryWrapper.eq(Position::getPositionName, positionVO.getPosition()).eq(Position::getTenantId, positionVO.getTenant())
+                .eq(Position::getPositionIsOnly,1);
                 List<Position> positionList = this.list(lambdaQueryWrapper);
                 if (positionList.size() > 0) {
                     return Response.error("职位名称已存在");
                 }
-            }
             Position position = new Position();
             position
                     .setPositionName(positionVO.getPosition())

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

@@ -58,8 +58,16 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void deleteRole(RoleVO roleVO) {
+    public String deleteRole(RoleVO roleVO) {
         try {
+            //根据角色id查询角色
+ Integer roleType =this.getRoleType(roleVO.getId());
+            if(roleType.equals(1)){
+                return Response.error("无法删除系统管理员");
+            }
+            else if(roleType.equals(2)){
+                return  Response.error("无法删除租户管理员");
+            }
             Role role = new Role();
             role.setId(roleVO.getId());
             role.deleteById();
@@ -75,15 +83,24 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
             positionRoleService.deletePositionRole(null, roleVO.getId());
             //部门角色
             departRoleService.delAssociateDepartRole(null, roleVO.getId(), null);
+            return Response.success("删除成功");
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
         }
+        return Response.success("删除成功");
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void updateRole(RoleVO roleVO) {
+    public String updateRole(RoleVO roleVO) {
         try {
+            Integer roleType =this.getRoleType(roleVO.getId());
+            if(roleType.equals(1)){
+                return Response.error("无法修改系统管理员");
+            }
+            else if(roleType.equals(2)){
+                return  Response.error("无法修改租户管理员");
+            }
             Role role = new Role();
             role
                     .setRoleDescription(roleVO.getRemark())
@@ -91,10 +108,12 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
                     .setId(roleVO.getId());
             role.updateById();
             roleFunctionDataService.updateRoleFunctionData(roleVO);
+            return Response.success("角色修改成功");
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
         }
+        return Response.success("角色修改成功");
     }
 
     public String getRoleList() { //获取用户信息
@@ -159,4 +178,10 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
         return roleVOS;
     }
 
+    private Integer getRoleType(Integer roleId){
+     Role role = this.getById(roleId);
+     return role.getRoleType();
+
+    }
+
 }

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

@@ -1,11 +1,8 @@
 package cn.cslg.permission.service;
 
 import cn.cslg.permission.common.model.vo.*;
-import cn.cslg.permission.common.utils.CacheUtils;
-import cn.cslg.permission.common.utils.DataUtils;
-import cn.cslg.permission.common.utils.Response;
+import cn.cslg.permission.common.utils.*;
 import cn.cslg.permission.common.utils.SecurityUtils.SecurityUtils;
-import cn.cslg.permission.common.utils.ThrowException;
 import cn.cslg.permission.domain.*;
 import cn.cslg.permission.mapper.AssoTenantVipTypeFunctionMapper;
 import cn.cslg.permission.mapper.TenantEntityMapper;
@@ -49,7 +46,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
     private final ClientService clientService;
     private final TenantService tenantService;
     private final InvitationService invitationService;
-
+    private final LoginUtils loginUtils;
     @Transactional(rollbackFor = Exception.class)
     public String addTenant(TenantVO tenantVO) {
         Personnel personnel = new Personnel();
@@ -219,10 +216,8 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
         List<Tenant> tenantPeople = this.list(lambdaQueryWrapper);
         return Response.success(setTenantToVO(tenantPeople));
     }
-
     public String queryPageList(TenantVO tenantVO) {
         LambdaQueryWrapper<Tenant> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-
         lambdaQueryWrapper.and((wrapper) -> wrapper.like(Tenant::getTenantName, tenantVO.getName())
                 .or()
                 .like(Tenant::getTenantAddress, tenantVO.getName())

PCS/src/main/java/cn/cslg/permission/service/associate/AssoTenantClientService.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.List;
+
 /**
  * @author lrj
  * @date 2023/2/24
@@ -25,18 +27,27 @@ public class AssoTenantClientService extends ServiceImpl<AssoTenantClientMapper,
      * 添加客户 租户关联关系
      */
     @Transactional(rollbackFor = Exception.class)
-    public void addTenantClient(int clientId, int tenantId) {
+    public Integer addTenantClient(int clientId, int tenantId) {
         try {
+            LambdaQueryWrapper<AssoTenantClient> wrapper =new LambdaQueryWrapper<>();
+            wrapper.eq(AssoTenantClient::getClientId,tenantId);
+            wrapper.eq(AssoTenantClient::getTenantId,tenantId);
+            List<AssoTenantClient> assoTenantClientList = this.list(wrapper);
+            if(assoTenantClientList.size()>0){
+                return -1;
+            }
             AssoTenantClient tenantClient = new AssoTenantClient();
             tenantClient
                     .setTenantId(tenantId)
                     .setClientId(clientId);
 
             this.save(tenantClient);
+            return 1;
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
         }
+        return 1;
     }
 
     /**