1.添加更新用户同步添加部门信息

api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java

@@ -1,10 +1,12 @@
 package com.glxp.api.admin.controller.auth;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.auth.AuthRole;
 import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
+import com.glxp.api.admin.entity.auth.DeptEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
@@ -14,6 +16,7 @@ import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.auth.AuthRoleAdminService;
 import com.glxp.api.admin.service.auth.AuthRoleService;
+import com.glxp.api.admin.service.auth.DeptService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.util.GennerOrderUtils;
 import com.glxp.api.admin.util.PasswordUtils;
@@ -47,6 +50,8 @@ public class AuthAdminController {
     GennerOrderUtils gennerOrderUtils;
     @Resource
     private InvSubWarehouseService invSubWarehouseService;
+    @Resource
+    private DeptService deptService;
 
     /**
      * 获取管理员列表
@@ -144,7 +149,16 @@ public class AuthAdminController {
         if (authAdmin.getPassWord() != null) {
             authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
         }
+
+        //设置部门信息
+        if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) {
+            authAdmin.setDept(authAdminSaveRequest.getDept());
+            DeptEntity deptEntity = deptService.findByDeptCode(authAdminSaveRequest.getDept());
+            authAdmin.setDeptName(deptEntity.getName());
+        }
+
         authAdmin.setLastModifyTime(new Date());
+
         authAdmin.setId(gennerOrderUtils.getRelId());
         boolean b = authAdminService.insertAuthAdmin(authAdmin);
         authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
@@ -192,6 +206,13 @@ public class AuthAdminController {
             authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
         }
         authAdmin.setLastModifyTime(new Date());
+
+        if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) {
+            authAdmin.setDept(authAdmin.getDept());
+            DeptEntity deptEntity = deptService.findByDeptCode(authAdmin.getDept());
+            authAdmin.setDeptName(deptEntity.getName());
+        }
+
         boolean b = authAdminService.updateAuthAdmin(authAdmin);
 
         if (!b) {
@@ -220,8 +241,8 @@ public class AuthAdminController {
         if (authAdminSaveRequest.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
         }
-        InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode());
+        InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode());
-        if(invSubWarehouseEntity!=null){
+        if (invSubWarehouseEntity != null) {
             authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId());
         }
         AuthAdmin authAdmin = new AuthAdmin();

api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java

@@ -21,4 +21,5 @@ public interface DeptDao {
 
     boolean deleteAll();
 
+    DeptEntity selectByCode(String code);
 }

api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java

@@ -23,4 +23,9 @@ public class AuthAdminQueryRequest extends ListPageRequest {
     //用户名 !=
     private String neUserName;
 
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java

@@ -20,4 +20,5 @@ public interface DeptService {
 
     boolean deleteAll();
 
+    DeptEntity findByDeptCode(String dept);
 }

api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java

@@ -43,4 +43,9 @@ public class DeptServiceImpl implements DeptService {
     public boolean deleteAll() {
         return deptDao.deleteAll();
     }
+
+    @Override
+    public DeptEntity findByDeptCode(String deptCode) {
+        return deptDao.selectByCode(deptCode);
+    }
 }

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -26,6 +26,9 @@
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(lastModifyTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND dept = #{deptCode}
+            </if>
         </where>
         ORDER BY id
         DESC

api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -50,4 +50,7 @@
         from auth_dept
     </delete>
 
+    <select id="selectByCode" resultType="com.glxp.api.admin.entity.auth.DeptEntity">
+        select * from auth_dept where code = #{code}
+    </select>
 </mapper>