新增部门，修改，代码备份

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

@@ -8,6 +8,7 @@ import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.api.admin.req.auth.LoginRequest;
 import com.glxp.api.admin.req.auth.PCLoginRequest;
 import com.glxp.api.admin.req.auth.UpdatePasswordRequest;
+import com.glxp.api.admin.res.auth.LoginResponse;
 import com.glxp.api.admin.service.auth.AuthCheckService;
 import com.glxp.api.admin.service.auth.DeviceKeyService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
@@ -109,8 +110,12 @@ public class LoginController {
         map.put("id", authAdmin.getId());
         map.put("token", token);
         map.put("time", DateUtil.getDateTime());
-
-        return ResultVOUtils.success(map);
+        LoginResponse loginResponse = new LoginResponse();
+        loginResponse.setId(authAdmin.getId() + "");
+        loginResponse.setToken(token);
+        loginResponse.setDept(authAdmin.getDept());
+        loginResponse.setDeptName(authAdmin.getDeptName());
+        return ResultVOUtils.success(loginResponse);
     }
 
     /**

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -840,7 +840,7 @@ public class WareHouseController {
                 orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN);
                 orderSaveRequest.setInvWarehouseCode(addOrderRequest.getInvWarehouseCode());
                 orderSaveRequest.setFromSubInvCode(addOrderRequest.getFromSubInvCode());
-
+                orderSaveRequest.setDeptCode(addOrderRequest.getDeptCode());
                 orderService.insertOrder(orderSaveRequest);
             }
 

api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java

@@ -65,4 +65,8 @@ public class OrderEntity {
     private String billTypeName;
     private String subInvName;
     private String invName;
+
+
+    private String deptCode;
+    private String deptName;
 }

api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java

@@ -34,4 +34,6 @@ public class AddOrderRequest {
     private boolean vailInv;
     private boolean codeFillCheck;
 
+    private String deptCode;
+
 }

api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginResponse.java

@@ -0,0 +1,15 @@
+package com.glxp.api.admin.res.auth;
+
+import lombok.Data;
+
+@Data
+public class LoginResponse {
+
+    private String id;
+    private String token;
+
+
+    private String dept;
+    private String deptName;
+
+}

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -182,7 +182,7 @@ public class HeartService {
                 && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities())
                 && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())
                 && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())
-                && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())
+                && CollUtil.isEmpty(syncDataResponse.getDeptEntityList())
                 && CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())
                 && CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities())
                 && CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities())) {

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

@@ -6,7 +6,7 @@
     <select id="listAdminPage" parameterType="com.glxp.api.admin.req.auth.AuthAdminQueryRequest"
             resultType="com.glxp.api.admin.entity.auth.AuthAdmin">
         SELECT auth_user.*,auth_dept.name deptName
-        FROM auth_user
+        FROM auth_user left join auth_dept on auth_user.dept = auth_dept.code
         <where>
             <if test="ids != null and ids.size > 0">
                 AND id IN
@@ -93,7 +93,7 @@
         #{createTime},
         #{userFlag,jdbcType=INTEGER},
         #{lastModifyTime},
-        #{employeeName},#{locInvCode},#{locSubInvCode},  #{dept})
+        #{employeeName},#{locInvCode},#{locSubInvCode}, #{dept})
     </insert>
 
     <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.admin.entity.auth.AuthAdmin">

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, originFromType)
+                             fromSubInvCode, createTime, originFromType,deptCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{deptCode})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -64,7 +64,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,deptCode)
         values (
         #{id},
         #{action},
@@ -99,7 +99,7 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},
-        #{originFromType}
+        #{originFromType},#{deptCode}
         )
     </insert>
 
@@ -142,6 +142,7 @@
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
             <if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
+            <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
 
         </trim>
         WHERE id = #{id}
@@ -194,13 +195,15 @@
 
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
-        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM
+        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name
+        billTypeName,auth_dept.name deptName FROM
         io_order
         left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
+        left join auth_dept on io_order.deptCode =auth_dept.code
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}