Merge remote-tracking branch 'origin/master'

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

@@ -242,19 +242,25 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！");
         }
 
+        // 先判断是否有相同名字的仓库
+        boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
+        if (checkResult) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
+        }
+
         //更新仓库信息
         invWarehouseEntity.setUpdateTime(new Date());
         boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
 
-        //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库
-        if (StrUtil.isBlank(invWarehouseEntity.getParentCode())) {
-            List<InvWarehouseEntity> invWarehouseEntityList = invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode());
-            for (InvWarehouseEntity obj : invWarehouseEntityList) {
-                obj.setAdvanceType(invWarehouseEntity.getAdvanceType());
-                obj.setUpdateTime(new Date());
-                invWarehouseService.updateInvSubWarehouse(obj);
-            }
-        }
+//        //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库
+//        if (StrUtil.isBlank(invWarehouseEntity.getParentCode())) {
+//            List<InvWarehouseEntity> invWarehouseEntityList = invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode());
+//            for (InvWarehouseEntity obj : invWarehouseEntityList) {
+//                obj.setAdvanceType(invWarehouseEntity.getAdvanceType());
+//                obj.setUpdateTime(new Date());
+//                invWarehouseService.updateInvSubWarehouse(obj);
+//            }
+//        }
 
 
         //更新部门信息

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

@@ -309,6 +309,8 @@ public class SysUserController extends BaseController {
             for (DeptUserEntity deptUserEntity : deptUserEntities) {
                 if(deptUserEntity.getDeptId() == 1){
                   checkDeptId=true;
+                }else{
+                    deptCodeList.add(deptUserEntity.getDeptId());
                 }
             }
             if(checkDeptId==false){

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -79,7 +79,7 @@
     <delete id="deleteByUser" parameterType="java.lang.Long">
         delete
         from auth_dept_user
-        where userId = #{userId}
+        where userId = #{userId} and deptId != 1
     </delete>
     <delete id="deleteByDept" parameterType="java.lang.Long">
         delete