Просмотр исходного кода

修改添加管理端用户,编辑管理端用户接口

liu 1 год назад
Родитель
Сommit
5f575d5d3f
1 измененных файлов с 22 добавлено и 6 удалено
  1. 22 6
      src/main/java/com/template/controller/AdminController.java

+ 22 - 6
src/main/java/com/template/controller/AdminController.java

@@ -1,7 +1,6 @@
 package com.template.controller;
 package com.template.controller;
 
 
 
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,15 +11,11 @@ import com.template.config.MySecurity;
 import com.template.model.dto.SaveAdminDto;
 import com.template.model.dto.SaveAdminDto;
 import com.template.model.dto.UpdateAdminDto;
 import com.template.model.dto.UpdateAdminDto;
 import com.template.model.dto.UsersPageDto;
 import com.template.model.dto.UsersPageDto;
-import com.template.model.pojo.Admin;
-import com.template.model.pojo.AdminMenu;
-import com.template.model.pojo.PermissionSetting;
-import com.template.model.pojo.Users;
+import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.AdminVo;
 import com.template.model.vo.AdminVo;
 import com.template.model.vo.UsersVo;
 import com.template.model.vo.UsersVo;
 import com.template.services.*;
 import com.template.services.*;
-import com.template.model.pojo.Organization;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -157,6 +152,15 @@ public class AdminController implements AdminAPI {
             return CommonResult.fail("暂无该用户");
             return CommonResult.fail("暂无该用户");
         }
         }
 
 
+//        通过用户id找管理端用户,如果有就不能在绑定
+        LambdaQueryWrapper<Admin> wrapperA=new LambdaQueryWrapper<>();
+        wrapperA.eq(Admin::getUsersId,users.getId());
+        Admin one = adminService.getOne(wrapperA);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("该用户已绑定,请更换绑定用户");
+        }
+
+
 //  密码加密
 //  密码加密
         String passWord = saveAdminDto.getPassWord();
         String passWord = saveAdminDto.getPassWord();
         try {
         try {
@@ -216,6 +220,18 @@ public class AdminController implements AdminAPI {
             }
             }
         }
         }
 
 
+//        用户不能重复绑定
+        String usersId = admin.getUsersId();
+        String usersId1 = byId.getUsersId();
+        if (!usersId.equals(usersId1)) {
+            LambdaQueryWrapper<Admin> wrapperA=new LambdaQueryWrapper<>();
+            wrapperA.eq(Admin::getUsersId,users.getId());
+            Admin one = adminService.getOne(wrapperA);
+            if (ObjectUtils.isNotEmpty(one)) {
+                return CommonResult.fail("该用户已绑定,请更换绑定用户");
+            }
+        }
+
         try {
         try {
             String passWord = admin.getPassWord();
             String passWord = admin.getPassWord();
             String encrypt = RSAUtils.encrypt(passWord, RSAUtils.getPublicKey(mySecurity.publicKey));
             String encrypt = RSAUtils.encrypt(passWord, RSAUtils.getPublicKey(mySecurity.publicKey));