Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

src/main/java/com/gree/mall/manager/logic/admin/AdminDeptLogic.java

@@ -55,8 +55,7 @@ public class AdminDeptLogic {
 
         List<Integer> types = new ArrayList<>();
         types.add(0);
-        types.add(1);
-        types.add(3);
+
 
 
         if (!types.contains(adminUser.getType()) ){

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -393,16 +393,18 @@ public class AdminUserLogic {
                 .collect(Collectors.toList());
 
         if (CollectionUtil.isNotEmpty(deptList)) {
+            // 找出部门下的商家
             for (String deptId : deptList) {
+
+
                 // 遍历部门递归找出子部门
                 this.querySubDeptId(deptId, deptIdList);
                 deptIdList.add(deptId);
             }
 
-            for (String deptId : deptIdList) {
-                // 找出部门下的商家
+            for (String deptss : deptIdList) {
                 final List<AdminDeptWebsit> adminDeptWebsits = adminDeptWebsitService.lambdaQuery()
-                        .eq(AdminDeptWebsit::getAdminDeptId, deptId)
+                        .eq(AdminDeptWebsit::getAdminDeptId, deptss)
                         .list();
                 final List<String> websitIds = adminDeptWebsits.stream()
                         .map(AdminDeptWebsit::getWebsitId)

src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -58,6 +58,9 @@ public class AdminWebsitLogic {
     @Autowired
     AdminDeptWebsitService adminDeptWebsitService;
 
+    @Autowired
+    AdminDeptService adminDeptService;
+
     /**
      * 区域列表
      */
@@ -141,11 +144,16 @@ public class AdminWebsitLogic {
         adminUserBean.setPermissions(adminUserPermissions);
         adminUserLogic.save(adminUserBean, request);
 
+        AdminDept adminDept = adminDeptService.lambdaQuery()
+                .eq(AdminDept::getCompanyId, adminWebsit.getCompanyId())
+                .eq(AdminDept::getPId, 1)
+                .last("limit 1").one();
+
         AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();
         adminDeptWebsit.setWebsitName(adminWebsit.getName());
         adminDeptWebsit.setWebsitId(adminWebsit.getWebsitId());
-        adminDeptWebsit.setAdminDeptId(adminWebsit.getCompanyId());
-        adminDeptWebsit.setDeptName(adminWebsit.getCompanyName());
+        adminDeptWebsit.setAdminDeptId(adminDept.getAdminDeptId());
+        adminDeptWebsit.setDeptName(adminDept.getDeptName());
         adminDeptWebsit.insert();
 
     }
@@ -374,13 +382,18 @@ public class AdminWebsitLogic {
             adminUserBean.setPermissions(adminUserPermissions);
             adminUserLogic.save(adminUserBean, request);
 
+            AdminDept adminDept = adminDeptService.lambdaQuery()
+                    .eq(AdminDept::getCompanyId, adminWebsit.getCompanyId())
+                    .eq(AdminDept::getPId, 1)
+                    .last("limit 1").one();
 
             AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();
             adminDeptWebsit.setWebsitName(adminWebsit.getName());
             adminDeptWebsit.setWebsitId(adminWebsit.getWebsitId());
-            adminDeptWebsit.setAdminDeptId(adminWebsit.getCompanyId());
-            adminDeptWebsit.setDeptName(adminWebsit.getCompanyName());
+            adminDeptWebsit.setAdminDeptId(adminDept.getAdminDeptId());
+            adminDeptWebsit.setDeptName(adminDept.getDeptName());
             adminDeptWebsit.insert();
+
         }
     }
 }