Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/enums/CouponCrowdEnum.java

@@ -14,10 +14,10 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum CouponCrowdEnum implements BaseEnum, IEnum<Integer> {
 
-    ALL("0","所有会员"),
-    SPECIFY("2","指定会员"),
-    ALL_SERVICE("3","全部业务员"),
-    ALL_GENRERAL("4","全部普通用户"),;
+    ALL("0","所有用户"),
+    SPECIFY("2","指定用户"),
+    ALL_SERVICE("3","所有分销员"),
+    ALL_GENRERAL("4","所有普通用户"),;
 
     @JsonValue
     @EnumValue

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

@@ -51,11 +51,19 @@ public class AdminDeptLogic {
 
     public List<AdminDeptTree> tree(HttpServletRequest request) {
         final AdminUserCom adminUser = commonLogic.getAdminUser();
-
-        List<AdminDept> list = adminDeptService.lambdaQuery()
+        List<AdminDept> list = new ArrayList<>();
+        if (!adminUser.getType().equals(1) ){
+            list = adminDeptService.lambdaQuery()
                     .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyWechatId, adminUser.getAdminCompanyIds())
+                    .eq(AdminDept::getPId, "1")
+                    .list();
+        }else{
+            list = adminDeptService.lambdaQuery()
+                    .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .eq(AdminDept::getAdminDeptId, "1")
                     .list();
+        }
+
 
         List<AdminDeptTree> trees = new ArrayList<>();
         for (AdminDept adminDept : list) {

src/main/java/com/gree/mall/manager/logic/common/SysDictCompanyLogic.java

@@ -62,7 +62,7 @@ public class SysDictCompanyLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         IPage<SysDictCompanyVO> sysDictIPage = adminMapper.sysDictCompanyList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParam
-                , companyWechatIds);
+                , null);
         return sysDictIPage;
     }
 

src/main/java/com/gree/mall/manager/logic/goods/GoodsApplyLogic.java

@@ -207,12 +207,21 @@ public class GoodsApplyLogic {
             }
         }
 
-        if (ifStatus)
+        if (ifStatus) {
             goodsApplyAddUp.setStatus(ExamineStatusEnum.OK.getKey());
-        else
+        }else {
             goodsApplyAddUp.setStatus(ExamineStatusEnum.WAIT.getKey());
+            goodsApplyAddUp.updateById();
+
+            goodsApplyService.lambdaUpdate()
+                    .set(GoodsApply::getApproveName,null)
+                    .set(GoodsApply::getApproveRemark,null)
+                    .set(GoodsApply::getApproveTime,null)
+                    .eq(GoodsApply::getGoodsApplyId,goodsApplyAddUp.getGoodsApplyId())
+                    .update();
+        }
+
 
-        goodsApplyAddUp.updateById();
         goodsApplyItemService.saveBatch(goodsApplyItemList);
     }