修改 部门问题 和供应商账号信息问题

src/main/java/com/glxp/api/controller/auth/DeptUserController.java

@@ -6,6 +6,7 @@ import com.glxp.api.annotation.Log;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.DeptUserEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.auth.FilterDeptUserReqeust;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -14,6 +15,8 @@ import com.glxp.api.service.auth.DeptService;
 import com.glxp.api.service.auth.DeptUserService;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.service.auth.WarehouseUserService;
+import com.glxp.api.service.inout.IoOrderService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +33,11 @@ public class DeptUserController {
     DeptUserService deptUserService;
     @Resource
     DeptService deptService;
+    @Resource
+    IoOrderService ioOrderService;
+
+    @Resource
+    WarehouseUserService  warehouseUserService;
 
 
     @AuthRuleAnnotation("")
@@ -56,6 +64,26 @@ public class DeptUserController {
     @PostMapping("udi/auth/dept/user/delete")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) {
+            // 判断此用户是否创建单据
+        List<IoOrderEntity> ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId());
+        if( ioOrderEntities != null){
+            return ResultVOUtils.error(500,"该用户已创建单据,不能移除!");
+        }
+        //判断此用户是否与仓库有关联
+        List<String> listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + "");
+        if( listWareHouse != null ){
+            return ResultVOUtils.error(500,"该用户已绑定仓库,不能移除!");
+        }
+
+        //判断此用户是否与除一级部门 还绑定其他部门
+        FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
+        filterDeptUserReqeust.setUserId(deptUserEntity.getUserId());
+        List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
+        if( deptUserEntities != null && deptUserEntities.size()>1){
+            return ResultVOUtils.error(500,"该用户已绑定多个部门,不能移除!");
+        }
+
+
         boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId());
         if (b)
             return ResultVOUtils.success("移除成功！");

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -11,6 +11,7 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.AuthUserSaveRequest;
+import com.glxp.api.req.auth.FilterDeptUserReqeust;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.auth.AuthAdminResponse;
 import com.glxp.api.res.auth.DeptUserResponse;
@@ -24,6 +25,7 @@ import com.glxp.api.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.codehaus.groovy.util.StringUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +44,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/user")
+@Transactional(rollbackFor = Exception.class)
 public class SysUserController extends BaseController {
 
     private final AuthAdminService userService;
@@ -293,10 +296,26 @@ public class SysUserController extends BaseController {
         userService.updateAuthAdmin(authAdmin);
 
 
-        //默认插入第一部门
-        List<Long> deptCodeList=authUserSaveRequest.getDepts();
-        deptCodeList.add(1L);
-        authUserSaveRequest.setDepts(deptCodeList);
+            //默认插入第一部门
+        List<Long> deptCodeList = null;
+        FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
+        filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
+        List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
+        if(deptUserEntities == null){
+                deptCodeList.add(1L);
+                authUserSaveRequest.setDepts(deptCodeList);
+            }else{
+            Boolean checkDeptId=false;
+            for (DeptUserEntity deptUserEntity : deptUserEntities) {
+                if(deptUserEntity.getDeptId() == 1){
+                  checkDeptId=true;
+                }
+            }
+            if(checkDeptId==false){
+                deptCodeList.add(1L);
+                authUserSaveRequest.setDepts(deptCodeList);
+            }
+        }
 
         //修改所属部门
         deptUserService.deleteByUser(authUserSaveRequest.getId());

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -122,4 +122,5 @@ public interface IoOrderService {
 
 
     boolean isExitByAction(String action);
+    List<IoOrderEntity> selectList(Long userId);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -803,6 +803,12 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.exists(new QueryWrapper<IoOrderEntity>().eq("action", action));
     }
 
+    @Override
+    public List<IoOrderEntity> selectList(Long userId) {
+        List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser",userId));
+        return ioOrderEntities;
+    }
+
     /**
      * 查询此单据关联的所有单据
      *