‘linchangsheng’ пре 11 месеци
родитељ
комит
185e1f6a79

+ 4 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserBean.java

@@ -42,9 +42,12 @@ public class AdminUserBean extends AdminUser {
     private String minLogo2;
     @ApiModelProperty("小程序默认头像logo")
     private String minLogo3;
-    @ApiModelProperty("部门id")
+    @ApiModelProperty("网点id")
     private String adminWebsitId;
 
+    @ApiModelProperty("部门id")
+    private String adminDeptId;
+
     @ApiModelProperty("部门ids")
     private List<String> adminWebsitIds;
     @ApiModelProperty("使用小程序模板类型:  1=模板1 2=模板2")

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminDeptLogic.java

@@ -109,6 +109,9 @@ public class AdminDeptLogic {
 
     public void update(AdminDept adminDept) {
         adminDept.updateById();
+
+        adminDeptWebsitService.lambdaUpdate().eq(AdminDeptWebsit::getAdminDeptId,adminDept.getAdminDeptId())
+                .set(AdminDeptWebsit::getDeptName,adminDept.getDeptName()).update();
     }
 
     public void del(String id) {

+ 1 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -495,6 +495,7 @@ public class AdminUserLogic {
                     .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
 
             if (adminUserDeptRela != null){
+                adminUserBean.setAdminDeptId(adminUserDeptRela.getAdminDeptId());
                 List<AdminDeptWebsit> adminDeptWebsitList = adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, adminUserDeptRela.getAdminDeptId()).list();
                 List<String> collect = adminDeptWebsitList.stream().map(AdminDeptWebsit::getWebsitId).collect(Collectors.toList());
                 adminUserBean.setAdminWebsitIds(collect);