Merge remote-tracking branch 'origin/master'

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

@@ -245,6 +245,18 @@ public class InvWarehouseController extends BaseController {
         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);
+            }
+        }
+
+
+
         //更新部门信息
         DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
         pEntity.setUpdateTime(new Date());

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

@@ -55,6 +55,9 @@ public class SysUserController extends BaseController {
     @Resource
     private AuthAdminService authAdminService;
 
+    @Resource
+    private DeptService deptService;
+
     @GetMapping("/list")
     public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) {
 
@@ -77,10 +80,16 @@ public class SysUserController extends BaseController {
                 List<Long> depts = new ArrayList<>();
                 String deptName = "";
                 for (DeptUserResponse deptUserResponse : deptUserResponses) {
+                    if(deptUserResponse.getDeptId()!=1){
                         depts.add(deptUserResponse.getDeptId());
                         deptName = deptName + "," + deptUserResponse.getDeptName();
                     }
+                }
+                if(deptName.length()!=0){
                     authAdminResponse.setDeptName(deptName.substring(1));
+                }else{
+                    authAdminResponse.setDeptName(deptName);
+                }
                 authAdminResponse.setDepts(depts);
             }
             authAdminResponse.setRoles(roles);
@@ -199,6 +208,11 @@ public class SysUserController extends BaseController {
 //        sysUserRole.setUserId(authAdmin.getId());
 //        sysUserRole.setRoleId(sysUserRole1.getRoleId());
 //        userService.insertUserAuth1(sysUserRole);
+        //默认插入第一部门
+        List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        deptCodeList.add(1L);
+        authUserSaveRequest.setDepts(deptCodeList);
+
 
 
         //插入部门
@@ -276,6 +290,11 @@ public class SysUserController extends BaseController {
         userService.updateAuthAdmin(authAdmin);
 
 
+        //默认插入第一部门
+        List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        deptCodeList.add(1L);
+        authUserSaveRequest.setDepts(deptCodeList);
+
         //修改所属部门
         deptUserService.deleteByUser(authUserSaveRequest.getId());
         if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) {

src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.auth;
 
 import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.req.auth.FilterInvSubWarehouseRequest;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
@@ -105,4 +106,6 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
      */
     InvWarehouseEntity filterInvSubWarehouseLimitOne(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
+    List<InvWarehouseEntity> selectLowWarehouseAll(@Param("pcode") String pCode);
+
 }

src/main/java/com/glxp/api/service/auth/InvWarehouseService.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.auth;
 
+import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.req.auth.FilterInvSubWarehouseRequest;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
@@ -85,4 +86,7 @@ public interface InvWarehouseService {
     String selectParentIdByCode( String invCode);
 
     List<InvWarehouseEntity> selectInvById(List<String> InvList);
+
+
+    List<InvWarehouseEntity> selectLowWarehouseAll(String pCode);
 }

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -233,4 +233,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
     public List<InvWarehouseEntity> selectInvById(List<String> InvList) {
         return invWarehouseDao.selectInvById(InvList);
     }
+
+    @Override
+    public List<InvWarehouseEntity> selectLowWarehouseAll(String pCode) {
+        return invWarehouseDao.selectLowWarehouseAll(pCode);
+    }
 }

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

@@ -421,4 +421,14 @@
         </where>
         limit 1
     </select>
+
+
+    <select id="selectLowWarehouseAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+        with recursive table_a as (
+            select * from auth_warehouse ta where parentCode = #{pcode}
+            union all
+            select tb.* from auth_warehouse tb inner join table_a on table_a.code = tb.parentCode
+        )
+        select * from  table_a
+    </select>
 </mapper>