用户管理

pom.xml

@@ -475,7 +475,7 @@
             <plugin>
                 <groupId>com.plus.plugin</groupId>
                 <artifactId>plus-maven-plugin</artifactId>
-                <version>2.0.0</version>
+                <version>5.0.0-SNAPSHOT</version>
                 <configuration>
                     <configPath>src/main/resources/generator-${profiles.active}.properties</configPath>
                 </configuration>

src/main/java/com/gree/mall/manager/bean/admin/AdminUserBean.java

@@ -1,51 +1,17 @@
 package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.plus.entity.AdminUser;
-import com.gree.mall.manager.plus.entity.AdminUserCompanyRela;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
+@EqualsAndHashCode(callSuper = true)
 @ApiModel
 @Data
 public class AdminUserBean extends AdminUser {
 
-    @ApiModelProperty("企业id")
-    private String corpId;
-    @ApiModelProperty("小程序应用id")
-    private Integer agentId1;
-    @ApiModelProperty("企业微信小程序密钥")
-    private String secret1;
-    @ApiModelProperty("标签密钥")
-    private String secret2;
-    @ApiModelProperty("通讯录密钥")
-    private String secret3;
-    @ApiModelProperty("token")
-    private String token;
-    @ApiModelProperty("所属公司")
-    private List<AdminUserCompanyRela> adminUserCompanyRelaList;
-    @ApiModelProperty("appId")
-    private String appId;
-    private String mchId;
-    private String mchKey;
-    private String subAppId;
-    private String subSecret;
-    private String subMchId;
-    private String template;
-    @ApiModelProperty("小程序名称")
-    private String minAppName;
-    @ApiModelProperty("小程序授权页logo")
-    private String minLogo1;
-    @ApiModelProperty("小程序通用logo")
-    private String minLogo2;
-    @ApiModelProperty("小程序默认头像logo")
-    private String minLogo3;
-    @ApiModelProperty("部门id集合")
-    private List<String> adminWebsitIds;
-    @ApiModelProperty("使用小程序模板类型:  1=模板1 2=模板2")
-    private Integer useTemplate;
-    @ApiModelProperty("退款是否要密码 true=是 false=否")
-    private Boolean isRefundPassword = false;
+
+
+
+
 }

src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.AdminUserPermissionsRela;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,21 +14,34 @@ import java.util.List;
 @Data
 public class AdminUserCom extends AdminUser {
 
-    @ApiModelProperty("商家id")
+    @ApiModelProperty("商户集合")
+    private List<String> adminCompanyIds;
+
+    @ApiModelProperty("商家集合")
     private List<String> adminWebsitIds;
-    @ApiModelProperty("部门id")
+
+    @ApiModelProperty("部门集合")
     private List<String> adminDeptIds;
+
     @ApiModelProperty("只读帐号")
     private Boolean onlyRead = false;
-    @ApiModelProperty("商户id")
-    private List<String> companyWechatIds;
+
     @ApiModelProperty("当前登录人企业微信id")
     private String loginCompanyWechatId;
+
     @ApiModelProperty("当前登录人企业名称")
     private String loginCompanyName;
+
     @ApiModelProperty("当前登录人所使用的商户配置")
     private AdminCompanyWechat adminCompanyWechat;
+
     @ApiModelProperty("商家")
     private AdminWebsit adminWebsit;
 
+    @ApiModelProperty("token")
+    private String token;
+
+    @ApiModelProperty("数据权限集合")
+    private List<AdminUserPermissionsRela> permissions;
+
 }

src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminUserAddReqBean.java

@@ -4,13 +4,15 @@ import com.gree.mall.manager.plus.entity.AdminUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(value="AdminUserAddBean对象", description="新增用户对象")
 public class AdminUserAddReqBean extends AdminUser {
 
-    @ApiModelProperty("部门id集合")
-    private List<String> adminWebsitIds;
+    @ApiModelProperty("数据权限集合")
+    private List<AdminUserPermissions> permissions;
 }

src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminUserPermissions.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class AdminUserPermissions {
+
+    @ApiModelProperty("数据权限")
+    private String permissionsId;
+
+    @ApiModelProperty("是否部门 true=是 false=否")
+    private Boolean isDept;
+}

src/main/java/com/gree/mall/manager/config/MpMetaObjectHandler.java

@@ -0,0 +1,54 @@
+package com.gree.mall.manager.config;
+
+import com.alibaba.excel.util.StringUtils;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.gree.mall.manager.utils.CommonUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+/**
+ * 自动补充插入或更新时的值
+ */
+@Slf4j
+@Component
+public class MpMetaObjectHandler implements MetaObjectHandler {
+    /**
+     * 插入时的填充策略
+     * @param metaObject
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        String by = CommonUtils.getNickName();
+        String username = CommonUtils.getUsername();
+        if(StringUtils.isNotBlank(username)){
+            by = "(" + username+ ")" + by;
+        }
+        if (this.getFieldValByName("isThreeOrder",metaObject) != null)
+            return;
+
+            this.setFieldValByName("createBy", by, metaObject);
+            this.setFieldValByName("updateBy", by, metaObject);
+            this.setFieldValByName("createTime", new Date(), metaObject);
+            this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+
+    /**
+     * 更新时的填充策略
+     * @param metaObject
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        String by = CommonUtils.getNickName();
+        String username = CommonUtils.getUsername();
+        if(StringUtils.isNotBlank(username)){
+            by = "(" + username+ ")" + by;
+        }
+
+        this.setFieldValByName("updateBy", by, metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}

src/main/java/com/gree/mall/manager/controller/admin/AdminUserController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.annotation.ApiNotAuth;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.SVerification;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.ExternalMapBean;
 import com.gree.mall.manager.bean.admin.reqDto.AdminCompanyWechatReqBean;
 import com.gree.mall.manager.bean.admin.reqDto.AdminUserAddReqBean;
@@ -30,7 +31,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
-@Api(value = "系统用户管理", tags ={"后台用户相关API"} )
+@Api(value = "系统用户管理", tags = {"后台用户相关API"})
 @RequestMapping(value = "/admin/user", produces = "application/json; charset=utf-8")
 public class AdminUserController {
 
@@ -42,86 +43,56 @@ public class AdminUserController {
     @ApiNotAuth
     @PostMapping("/login")
     @ApiOperation(value = "登录")
-    public ResponseHelper<AdminUserBean> login(
-            @ApiParam(value = "帐号",required = true) @RequestParam(required = true) String userName,
-            @ApiParam(value = "密码",required = true) @RequestParam(required = true) String password,
-            @ApiParam(value = "验证码code",required = true) @RequestParam(required = true) String code,
-            @ApiParam(value = "验证码值",required = true) @RequestParam(required = true) String codeValue
+    public ResponseHelper<AdminUserCom> login(
+            @ApiParam(value = "帐号", required = true) @RequestParam(required = true) String userName,
+            @ApiParam(value = "密码", required = true) @RequestParam(required = true) String password,
+            @ApiParam(value = "验证码code", required = true) @RequestParam(required = true) String code,
+            @ApiParam(value = "验证码值", required = true) @RequestParam(required = true) String codeValue
 
     ) throws RemoteServiceException {
-        AdminUserBean adminUserBean = adminUserLogic.login(userName, password,code,codeValue);
+        AdminUserCom adminUserBean = adminUserLogic.login(userName, password, code, codeValue);
         return ResponseHelper.success(adminUserBean);
     }
 
     @PostMapping("/password/update")
     @ApiOperation(value = "修改密码")
     public ResponseHelper<AdminUserBean> login(
-            @ApiParam(value = "帐号",required = true) @RequestParam(required = true) String userName,
-            @ApiParam(value = "密码",required = true) @RequestParam(required = true) String password,
-            @ApiParam(value = "新密码",required = true) @RequestParam(required = true) String newPassword
+            @ApiParam(value = "帐号", required = true) @RequestParam(required = true) String userName,
+            @ApiParam(value = "密码", required = true) @RequestParam(required = true) String password,
+            @ApiParam(value = "新密码", required = true) @RequestParam(required = true) String newPassword
     ) throws RemoteServiceException {
-        adminUserLogic.updatePassword(userName, password,newPassword);
+        adminUserLogic.updatePassword(userName, password, newPassword);
         return ResponseHelper.success();
     }
 
     @PostMapping("/status/update")
     @ApiOperation("修改帐号状态(冻结/正常)")
     public ResponseHelper updateStatus(
-            @ApiParam(value = "帐号名称",required = true) @RequestParam(required = true) String adminUserId,
-            @ApiParam(value = "true:正常  false:冻结",required = true) @RequestParam(required = true) Boolean status
-    ) throws RemoteServiceException {
-        adminUserLogic.updateStatus(adminUserId,status);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/addCompanyWechat")
-    @ApiOperation("新增商户")
-    public ResponseHelper addCompanyWechat(
-            @ApiParam(value = "帐号",required = true) @RequestBody AdminCompanyWechatReqBean adminUserBean,
-            HttpServletRequest request
+            @ApiParam(value = "帐号名称", required = true) @RequestParam(required = true) String adminUserId,
+            @ApiParam(value = "true:正常  false:冻结", required = true) @RequestParam(required = true) Boolean status
     ) throws RemoteServiceException {
-        adminCompanyWechatLogic.addCompanyWechat(adminUserBean,request);
+        adminUserLogic.updateStatus(adminUserId, status);
         return ResponseHelper.success();
     }
 
-    @PostMapping("/add")
-    @ApiOperation("新增帐号")
+    @PostMapping("/save")
+    @ApiOperation("保存帐号")
     public ResponseHelper add(
-            @ApiParam(value = "帐号",required = true) @RequestBody AdminUserAddReqBean adminUserBean,
+            @ApiParam(value = "帐号", required = true) @RequestBody AdminUserAddReqBean adminUserBean,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        adminUserLogic.add(adminUserBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/user/updateCompanyWechat")
-    @ApiOperation(value = "修改商户信息")
-    public ResponseHelper updateCompanyWechat(
-            @ApiParam(value = "商户信息", required = true) @RequestBody AdminCompanyWechat adminCompanyWechat
-    ) throws RemoteServiceException {
-        adminCompanyWechatLogic.updateCompanyWechat(adminCompanyWechat);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/user/update")
-    @ApiOperation(value = "修改帐号")
-    public ResponseHelper updateUser(
-            HttpServletRequest request,
-            @ApiParam(value = "帐号", required = true) @RequestBody AdminUserAddReqBean adminUserBean
-    ) throws RemoteServiceException {
-        adminUserLogic.update(request, adminUserBean);
+        adminUserLogic.save(adminUserBean, request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/password/reset")
     @ApiOperation("重置密码")
     public ResponseHelper resetPwd(
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String adminUserId,
-            @ApiParam(value = "密码",required = true) @RequestParam(required = true) String password,
+            @ApiParam(value = "用户id", required = true) @RequestParam String adminUserId,
+            @ApiParam(value = "密码", required = true) @RequestParam String password,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        adminUserLogic.resetPassword(adminUserId,password,request);
+        adminUserLogic.resetPassword(adminUserId, password, request);
         return ResponseHelper.success();
     }
 
@@ -129,53 +100,53 @@ public class AdminUserController {
     @GetMapping("/list")
     @ApiOperation(value = "帐号列表")
     public ResponseHelper<IPage<AdminUser>> list(
-            @ApiParam(value = "角色id",required = false) @RequestParam(required = false) String roleId,
-            @ApiParam(value = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "用户名",required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
+            @ApiParam(value = "角色id", required = false) @RequestParam(required = false) String roleId,
+            @ApiParam(value = "状态 true:正常 false:冻结", required = false) @RequestParam(required = false) Boolean status,
+            @ApiParam(value = "用户名", required = false) @RequestParam(required = false) String userName,
+            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<AdminUser> page = adminUserLogic.list(roleId,status,userName,pageNum, pageSize,request);
+        IPage<AdminUser> page = adminUserLogic.list(roleId, status, userName, pageNum, pageSize, request);
         return ResponseHelper.success(page);
     }
 
     @GetMapping("/mch/list")
     @ApiOperation(value = "商户列表")
     public ResponseHelper<IPage<AdminCompanyWechatRespPageBean>> list(
-            @ApiParam(value = "会员帐号",required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "用户昵称",required = false) @RequestParam(required = false) String nickName,
-            @ApiParam(value = "联系电话",required = false) @RequestParam(required = false) String linkPhone,
-            @ApiParam(value = "电子邮箱",required = false) @RequestParam(required = false) String email,
-            @ApiParam(value = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize
+            @ApiParam(value = "会员帐号", required = false) @RequestParam(required = false) String userName,
+            @ApiParam(value = "用户昵称", required = false) @RequestParam(required = false) String nickName,
+            @ApiParam(value = "联系电话", required = false) @RequestParam(required = false) String linkPhone,
+            @ApiParam(value = "电子邮箱", required = false) @RequestParam(required = false) String email,
+            @ApiParam(value = "状态 true:正常 false:冻结", required = false) @RequestParam(required = false) Boolean status,
+            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize
     ) throws RemoteServiceException {
-        IPage<AdminCompanyWechatRespPageBean> page = adminCompanyWechatLogic.list(userName,nickName,linkPhone,email,status,pageNum, pageSize);
+        IPage<AdminCompanyWechatRespPageBean> page = adminCompanyWechatLogic.list(userName, nickName, linkPhone, email, status, pageNum, pageSize);
         return ResponseHelper.success(page);
     }
 
     @GetMapping("/mch/export")
     @ApiOperation(value = "商户列表导出")
     public void exportMch(
-            @ApiParam(value = "会员帐号",required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "用户昵称",required = false) @RequestParam(required = false) String nickName,
-            @ApiParam(value = "联系电话",required = false) @RequestParam(required = false) String linkPhone,
-            @ApiParam(value = "电子邮箱",required = false) @RequestParam(required = false) String email,
-            @ApiParam(value = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
+            @ApiParam(value = "会员帐号", required = false) @RequestParam(required = false) String userName,
+            @ApiParam(value = "用户昵称", required = false) @RequestParam(required = false) String nickName,
+            @ApiParam(value = "联系电话", required = false) @RequestParam(required = false) String linkPhone,
+            @ApiParam(value = "电子邮箱", required = false) @RequestParam(required = false) String email,
+            @ApiParam(value = "状态 true:正常 false:冻结", required = false) @RequestParam(required = false) Boolean status,
             HttpServletRequest request,
             HttpServletResponse response
     ) throws Exception {
-        IPage<AdminUser> page = adminUserLogic.list(userName,nickName,linkPhone,email,status,1, -1);
+        IPage<AdminUser> page = adminUserLogic.list(userName, nickName, linkPhone, email, status, 1, -1);
         ExcelData excelData = adminUserLogic.exportMch(page.getRecords());
-        ExcelUtils.exportExcel(request,response,"mch.xlsx",excelData);
+        ExcelUtils.exportExcel(request, response, "mch.xlsx", excelData);
     }
 
 
     @GetMapping("/module/list")
     @ApiOperation(value = "功能菜单权限列表")
     public ResponseHelper<List<AdminModuleTree>> moduleList(
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String adminUserId
+            @ApiParam(value = "用户id", required = true) @RequestParam(required = true) String adminUserId
     ) throws RemoteServiceException {
         List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAdminModule(adminUserId);
         return ResponseHelper.success(adminModuleTrees);
@@ -184,7 +155,7 @@ public class AdminUserController {
     @GetMapping("/module/id/checked")
     @ApiOperation("查询选中的功能模块ids")
     public ResponseHelper<List<String>> queryModuleIdChecked(
-            @ApiParam(value = "角色id",required = true) @RequestParam(required = true) String adminRoleId
+            @ApiParam(value = "角色id", required = true) @RequestParam(required = true) String adminRoleId
     ) throws RemoteServiceException {
         List<String> moduleIds = adminUserLogic.queryModuleIdChecked(adminRoleId);
         return ResponseHelper.success(moduleIds);
@@ -193,35 +164,35 @@ public class AdminUserController {
     @GetMapping("/module/all")
     @ApiOperation(value = "全部功能菜单权限列表")
     public ResponseHelper<List<AdminModuleTree>> allModuleList(
-            @ApiParam(value = "角色",required = true) @RequestParam(required = true) String adminRoleId,
+            @ApiParam(value = "角色", required = true) @RequestParam(required = true) String adminRoleId,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAllAdminModuleTree(adminRoleId,request);
+        List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAllAdminModuleTree(adminRoleId, request);
         return ResponseHelper.success(adminModuleTrees);
     }
 
     @PostMapping("/module/grant")
     @ApiOperation(value = "授权动能菜单权限")
     public ResponseHelper grant(
-            @ApiParam(value = "角色id",required = true) @RequestParam(required = true) String adminRoleId,
-            @ApiParam(value = "功能模块ids",required = true) @RequestParam(required = true) List<String> adminModuleIds
+            @ApiParam(value = "角色id", required = true) @RequestParam(required = true) String adminRoleId,
+            @ApiParam(value = "功能模块ids", required = true) @RequestParam(required = true) List<String> adminModuleIds
     ) throws RemoteServiceException {
-        adminUserLogic.grantModules(adminRoleId,adminModuleIds);
+        adminUserLogic.grantModules(adminRoleId, adminModuleIds);
         return ResponseHelper.success();
     }
 
     @GetMapping("/detail")
     @ApiOperation(value = "详情")
-    public ResponseHelper<AdminUserBean> detail(
-            @ApiParam(value = "帐号id",required = true) @RequestParam(required = true) String adminUserId
+    public ResponseHelper<AdminUserCom> detail(
+            @ApiParam(value = "帐号id", required = true) @RequestParam(required = true) String adminUserId
     ) throws RemoteServiceException {
-        AdminUserBean detail = adminUserLogic.detail(adminUserId);
+        AdminUserCom detail = adminUserLogic.detail(adminUserId);
         return ResponseHelper.success(detail);
     }
 
     @PostMapping("/logout")
     @ApiOperation("退出登录")
-    public ResponseHelper logout(HttpServletRequest request){
+    public ResponseHelper logout(HttpServletRequest request) {
         adminUserLogic.logout(request);
         return ResponseHelper.success();
     }
@@ -239,11 +210,11 @@ public class AdminUserController {
     @PostMapping("/check-or-login/account")
     @ApiOperation(value = "检查账号")
     public ResponseHelper<ExternalMapBean> checkOrLoginAccount(
-            @ApiParam(value = "账号",required = true) @RequestParam String account,
-            @ApiParam(value = "密码",required = true) @RequestParam String password,
-            @ApiParam(value = "是否检查",required = true) @RequestParam Boolean isCheck,
-            @ApiParam(value = "时间戳",required = true) @RequestParam String timestamp,
-            @ApiParam(value = "签名",required = true) @RequestParam String sign
+            @ApiParam(value = "账号", required = true) @RequestParam String account,
+            @ApiParam(value = "密码", required = true) @RequestParam String password,
+            @ApiParam(value = "是否检查", required = true) @RequestParam Boolean isCheck,
+            @ApiParam(value = "时间戳", required = true) @RequestParam String timestamp,
+            @ApiParam(value = "签名", required = true) @RequestParam String sign
     ) throws Exception {
         ExternalMapBean bean = adminUserLogic.checkOrLoginAccount(account, password, isCheck, timestamp, sign);
         return ResponseHelper.success(bean);

src/main/java/com/gree/mall/manager/logic/CarouselMapLogic.java

@@ -34,7 +34,7 @@ public class CarouselMapLogic {
      */
     public IPage<CarouselMap> page(HttpServletRequest request, Boolean state, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return carouselMapService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), CarouselMap::getCompanyWechatId, companyWechatIds)
@@ -109,7 +109,7 @@ public class CarouselMapLogic {
      */
     public IPage<Goods> getGoods(HttpServletRequest request, String goodsId, String goodsName, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         if (StringUtils.isNotBlank(goodsId)) {
             return goodsService.lambdaQuery()

src/main/java/com/gree/mall/manager/logic/FreightLogic.java

@@ -16,7 +16,6 @@ import com.gree.mall.manager.plus.entity.Region;
 import com.gree.mall.manager.plus.service.FreightTemplateDetailService;
 import com.gree.mall.manager.plus.service.FreightTemplateService;
 import com.gree.mall.manager.plus.service.RegionService;
-import com.gree.mall.manager.utils.CommonUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,7 +47,7 @@ public class FreightLogic {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return freightTemplateService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), FreightTemplate::getCompanyWechatId, companyWechatIds)
@@ -140,7 +139,7 @@ public class FreightLogic {
     public BigDecimal getFreightAmount(HttpServletRequest request, String province, String city, String area, Integer num) throws RemoteServiceException {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         FreightTemplateDetail one = freightTemplateDetailService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), FreightTemplateDetail::getCompanyWechatId, companyWechatIds)

src/main/java/com/gree/mall/manager/logic/StorageLogic.java

@@ -36,7 +36,7 @@ public class StorageLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         return storageService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),Storage::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),Storage::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .page(new Page<>(pageNum, pageSize));
     }
 

src/main/java/com/gree/mall/manager/logic/activity/PromotionGroupLogic.java

@@ -14,7 +14,6 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
-import com.gree.mall.manager.utils.CommonUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,11 +64,11 @@ public class PromotionGroupLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         //已结束
         int count = promotionGroupService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PromotionGroup::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .eq(PromotionGroup::getStatus,false).count();
         //进行中
         int count2 = promotionGroupService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PromotionGroup::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .eq(PromotionGroup::getStatus,true).count();
         Map<String,Integer> map = new HashMap<>();
         map.put("all",count+count2);
@@ -89,7 +88,7 @@ public class PromotionGroupLogic {
 
         IPage page = promotionGroupService.lambdaQuery()
                 .eq(status != null, PromotionGroup::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PromotionGroup::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .orderByDesc(PromotionGroup::getCreateTime)
                 .page(new Page<>(pageNo, pageSize));
         //组装数据
@@ -514,7 +513,7 @@ public class PromotionGroupLogic {
      */
     public IPage<GoodsVisit> queryGoodsVisit(String promotionGroupId,String userId,Integer pageNo,Integer pageSize, HttpServletRequest request){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         IPage<GoodsVisit> page = goodsVisitService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsVisit::getCompanyWechatId, companyWechatIds)

src/main/java/com/gree/mall/manager/logic/activity/PromotionLuckDrawLogic.java

@@ -56,7 +56,7 @@ public class PromotionLuckDrawLogic {
      */
     public IPage<PromotionLuckDrawList> list(String name, Boolean status, Integer pageNum, Integer pageSize){
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        IPage<PromotionLuckDrawList> page = luckDrawMapper.queryList(new Page(pageNum, pageSize), name, status,adminUser.getCompanyWechatIds());
+        IPage<PromotionLuckDrawList> page = luckDrawMapper.queryList(new Page(pageNum, pageSize), name, status,adminUser.getAdminCompanyIds());
         return page;
     }
 
@@ -193,7 +193,7 @@ public class PromotionLuckDrawLogic {
                                                          String couponName, Integer status2,Integer pageNum,Integer pageSize){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         IPage<PromotionLuckDrawCodeBean> page = luckDrawMapper.queryLuckDrawCodeList(new Page(pageNum, pageSize), promotionLuckDrawId,promotinLuckDrawCouponId,
-                code, name, mobile, exchangeStartTime, exchangeEndTime, useStartTime, useEndTime, orderId, couponName, status2,adminUser.getCompanyWechatIds());
+                code, name, mobile, exchangeStartTime, exchangeEndTime, useStartTime, useEndTime, orderId, couponName, status2,adminUser.getAdminCompanyIds());
         return page;
     }
 

src/main/java/com/gree/mall/manager/logic/activity/SecKillLogic.java

@@ -1,21 +1,15 @@
 package com.gree.mall.manager.logic.activity;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.gree.mall.manager.bean.activity.*;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.goods.GoodsSpecBean;
 import com.gree.mall.manager.commonmapper.SecKillMapper;
-import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,7 +24,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
-import java.util.function.Function;
 
 @Slf4j
 @Component
@@ -67,7 +60,7 @@ public class SecKillLogic {
      */
     public IPage<CustomSecSpecBean> pageSpec(Integer status, String keyword, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<CustomSecSpecBean> customSecSpecBeanIPage = secKillMapper.querySecSpec(new Page(pageNum, pageSize), keyword, status,adminUser.getCompanyWechatIds());
+        IPage<CustomSecSpecBean> customSecSpecBeanIPage = secKillMapper.querySecSpec(new Page(pageNum, pageSize), keyword, status,adminUser.getAdminCompanyIds());
         return customSecSpecBeanIPage;
 
     }
@@ -75,7 +68,7 @@ public class SecKillLogic {
     public IPage<SecKillActivityStageBean> pageActivity(Integer status, String keyword, Date startTime, Integer pageNum, Integer pageSize,HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         IPage<SecKillActivityStageBean>  secKillActivityStageBeans = secKillMapper
-                .queryActivity(new Page(pageNum,pageSize),status, keyword, startTime, adminUser.getCompanyWechatIds());
+                .queryActivity(new Page(pageNum,pageSize),status, keyword, startTime, adminUser.getAdminCompanyIds());
         return secKillActivityStageBeans;
     }
 
@@ -330,7 +323,7 @@ public class SecKillLogic {
     public IPage<CustomSpecBean> goodsSpecList(String categoryId, String keyword, Integer pageNum, Integer pageSize,HttpServletRequest request) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<CustomSpecBean> page = secKillMapper.querySpecList(new Page(pageNum, pageSize), categoryId, keyword,adminUser.getCompanyWechatIds());
+        IPage<CustomSpecBean> page = secKillMapper.querySpecList(new Page(pageNum, pageSize), categoryId, keyword,adminUser.getAdminCompanyIds());
         return page;
     }
 

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

@@ -53,7 +53,6 @@ public class AdminCompanyWechatLogic {
      */
     @Transactional
     public void addCompanyWechat(AdminCompanyWechatReqBean adminCompanyWechat, HttpServletRequest request) {
-        adminCompanyWechat.getSubMchId();
         adminCompanyWechat.insert();
 
         AdminUser adminUser = new AdminUser();
@@ -72,7 +71,7 @@ public class AdminCompanyWechatLogic {
         BeanUtils.copyProperties(adminUser, adminUserAddReqBean);
         adminUserAddReqBean.setRoleId(adminRole.getAdminRoleId());
         //添加企业用户
-        adminUserLogic.add(adminUserAddReqBean, request);
+        adminUserLogic.save(adminUserAddReqBean, request);
 
         //初始化模板
         adminCompanyWechatTemplateLogic.initCompanyWechatTemplate(adminCompanyWechat.getCompanyWechatId(), adminCompanyWechat.getCompanyName());

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

@@ -6,16 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminDeptTree;
 import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.admin.reqDto.AdminUserPermissions;
 import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.AdminDept;
 import com.gree.mall.manager.plus.entity.AdminDeptWebsit;
-import com.gree.mall.manager.plus.entity.AdminUserDeptRela;
+import com.gree.mall.manager.plus.entity.AdminUserPermissionsRela;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.service.AdminDeptService;
 import com.gree.mall.manager.plus.service.AdminDeptWebsitService;
-import com.gree.mall.manager.plus.service.AdminUserDeptRelaService;
+import com.gree.mall.manager.plus.service.AdminUserPermissionsRelaService;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -44,7 +45,7 @@ public class AdminDeptLogic {
     private final AdminDeptService adminDeptService;
     private final AdminMapper adminMapper;
     private final AdminDeptWebsitService adminDeptWebsitService;
-    private final AdminUserDeptRelaService adminUserDeptRelaService;
+    private final AdminUserPermissionsRelaService adminUserPermissionsRelaService;
     private final AdminWebsitService adminWebsitService;
 
     public List<AdminDeptTree> tree(HttpServletRequest request) {
@@ -137,7 +138,7 @@ public class AdminDeptLogic {
         if (adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, id).count() > 0)
             throw new RemoteServiceException("存在绑定商家");
 
-        if (adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminDeptId, id).count() > 0) {
+        if (adminUserPermissionsRelaService.lambdaQuery().eq(AdminUserPermissionsRela::getAdminUserPermissionsId, id).count() > 0) {
             throw new RemoteServiceException("存在绑定账号");
         }
 

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

@@ -35,7 +35,7 @@ public class AdminRoleLogic {
      */
     public IPage<AdminRole> listPage(HttpServletRequest request, Integer pageNo, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         Integer type = adminRoleService.getById(adminUser.getRoleId()).getType();
         if("admin".equals(adminUser.getUserName())){

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

@@ -1,8 +1,10 @@
 package com.gree.mall.manager.logic.admin;
 
-import com.aliyuncs.utils.StringUtils;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
@@ -13,6 +15,7 @@ import com.gree.mall.manager.bean.admin.AdminUserBean;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.ExternalMapBean;
 import com.gree.mall.manager.bean.admin.reqDto.AdminUserAddReqBean;
+import com.gree.mall.manager.bean.admin.reqDto.AdminUserPermissions;
 import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.enums.RedisPrefixEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -20,9 +23,10 @@ import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.*;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,31 +41,35 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class AdminUserLogic {
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    DefaultKaptcha defaultKaptcha;
-    @Autowired
-    CommonLogic commonLogic;
-    @Autowired
-    AdminUserService adminUserService;
-    @Autowired
-    AdminModuleService adminModuleService;
-    @Autowired
-    AdminRoleService adminRoleService;
-    @Autowired
-    AdminUserModuleRelaService adminUserModuleRelaService;
-    @Autowired
-    AdminUserCompanyRelaService adminUserCompanyRelaService;
-    @Autowired
-    AdminCompanyWechatService adminCompanyWechatService;
-    @Autowired
-    AdminWebsitService adminWebsitService;
-    @Autowired
-    AdminUserWebsitRelaService adminUserWebsitRelaService;
-    @Autowired
-    AdminMapper adminMapper;
+
+    private final RedisUtil redisUtil;
+
+    private final DefaultKaptcha defaultKaptcha;
+
+    private final CommonLogic commonLogic;
+
+    private final AdminUserService adminUserService;
+
+    private final AdminModuleService adminModuleService;
+
+    private final AdminRoleService adminRoleService;
+
+    private final AdminUserModuleRelaService adminUserModuleRelaService;
+
+    private final AdminUserCompanyRelaService adminUserCompanyRelaService;
+
+    private final AdminCompanyWechatService adminCompanyWechatService;
+
+    private final AdminWebsitService adminWebsitService;
+
+    private final AdminUserPermissionsRelaService adminUserPermissionsRelaService;
+
+    private final AdminMapper adminMapper;
+
+    private final AdminDeptService adminDeptService;
+
     @Value("${front.top.url}")
     private String frontTopUrl;
 
@@ -92,7 +100,7 @@ public class AdminUserLogic {
     /**
      * 登录
      */
-    public AdminUserBean login(String userName, String password, String code, String codeValue) throws RemoteServiceException {
+    public AdminUserCom login(String userName, String password, String code, String codeValue) throws RemoteServiceException {
         String value = (String) redisUtil.get(RedisPrefixEnum.TOKEN_NEW_VERIFICATION + code);
         if (!value.equals(codeValue)) {
             throw new RemoteServiceException("验证码错误");
@@ -104,19 +112,19 @@ public class AdminUserLogic {
         if (!adminUser.getStatus()) {
             throw new RemoteServiceException("帐号冻结中，请联系相关管理人员");
         }
-        adminUser.setLastLoginTime(new Date());
+        adminUser.setLastLoginTime(DateUtil.date());
         adminUser.updateById();
 
-        AdminUserBean adminUserBean = new AdminUserBean();
+        AdminUserCom adminUserBean = new AdminUserCom();
         BeanUtils.copyProperties(adminUser, adminUserBean);
         //不返回密码
         adminUserBean.setPassword(null);
         adminUserBean.setToken(JwtUtils.createJWT(adminUser.getAdminUserId(), adminUser.getNickName(), adminUser.getUserName(), 20 * 60 * 60 * 1000));
-        //查询拥有的权限
-        List<AdminUserCompanyRela> list = adminUserCompanyRelaService.lambdaQuery().eq(AdminUserCompanyRela::getAdminUserId, adminUser.getAdminUserId()).list();
-        adminUserBean.setAdminUserCompanyRelaList(list);
+        //查询用户在系统的关系
+        adminUserBean = commonLogic.queryUserSysRela(adminUserBean);
+
         //存放到redis
-        redisUtil.set(RedisPrefixEnum.TOKEN_NEW_MGR.toString() + adminUserBean.getToken(), adminUser, 20 * 60 * 60 * 1000);
+        redisUtil.set(RedisPrefixEnum.TOKEN_NEW_MGR + adminUserBean.getToken(), adminUser, 20 * 60 * 60 * 1000);
         return adminUserBean;
     }
 
@@ -158,10 +166,10 @@ public class AdminUserLogic {
 
 
     /**
-     * 新增帐号
+     * 保存帐号
      */
     @Transactional
-    public void add(AdminUserAddReqBean adminUser, HttpServletRequest request) throws RemoteServiceException {
+    public void save(AdminUserAddReqBean adminUser, HttpServletRequest request) throws RemoteServiceException {
 
         AdminUserCom admin = commonLogic.getAdminUser(request);
 
@@ -172,183 +180,82 @@ public class AdminUserLogic {
         if (count > 0) {
             throw new RemoteServiceException("帐号已被注册");
         }
-        //需要用户roleId
-        AdminRole loginRole = adminRoleService.getById(admin.getRoleId());
-        AdminRole addUserRole = null;
+
+        if (StringUtils.isBlank(adminUser.getAdminUserId())) {
+            adminUser.setAdminUserId(IdWorker.getIdStr());
+        }
+
+        // 需要用户roleId
+        AdminRole addUserRole;
         if (StringUtils.isEmpty(adminUser.getRoleId()) ||
                 (addUserRole = adminRoleService.getById(adminUser.getRoleId())) == null) {
             throw new RemoteServiceException("请为用户选择角色");
         }
         adminUser.setRoleName(addUserRole.getName());
-        //  添加用户的角色级别 <= 被添加的用户的角色级别
-        if (loginRole.getType() <= addUserRole.getType()) {
-            throw new RemoteServiceException("无法为用户赋予与自身级别相当的角色");
-        }
-        //用户级别默认取角色级别
-        if (adminUser.getType() == null) {
-            //数据库和角色表 type值不一致
-            adminUser.setType(addUserRole.getType() - 1);
-        }
-        if (adminUser.getType() != (addUserRole.getType() - 1)) {
-            throw new RemoteServiceException("所选角色级别和用户级别不一致!!");
-        }
 
+        // 数据权限
+        this.dataPermissionsHandle(adminUser, adminUser.getPermissions());
 
-        //部门账号
-        if (adminUser.getType() == 0) {
-            //默认登录用户的CompanyWechatId (admin则无)
-            adminUser.setCompanyWechatId(admin.getCompanyWechatId());
-            adminUser.setCompanyName(admin.getCompanyName());
-        }
         adminUser.setPassword(MD5Utils.md5(adminUser.getPassword()));
-        adminUser.setCreateTime(new Date());
-        adminUserService.save(adminUser);
-
-        //部门账号
-        if (adminUser.getType() == 0) {
-            //添加部门
-            this.addAdminUserWebsit(adminUser);
-            //todo admin 添加的部门没有companyWechatId
-        }
-        //公司主账号
-        else if (adminUser.getType() == 1) {
-            AdminCompanyWechat companyWechat = null;
-            if (StringUtils.isEmpty(adminUser.getCompanyWechatId()) || (companyWechat = adminCompanyWechatService.getById(adminUser.getCompanyWechatId())) == null) {
-                throw new RemoteServiceException("admin添加公司主账号时候,必须要有companyWechatId");
-            }
-            AdminUserCompanyRela adminUserCompanyRela = new AdminUserCompanyRela();
-            adminUserCompanyRela.setAdminUserId(adminUser.getAdminUserId());
-            adminUserCompanyRela.setCompanyWechatId(companyWechat.getCompanyWechatId());
-            adminUserCompanyRela.setCompanyName(companyWechat.getCompanyName());
-            adminUserCompanyRela.setCreateTime(new Date());
-            adminUserCompanyRela.insert();
-        }
 
+        adminUserService.saveOrUpdate(adminUser);
     }
 
-    private void signUpCompany(AdminUserBean adminUser, String createBy) {
-        //查询企业负责人的角色帐号
-        AdminRole adminRole = adminRoleService.lambdaQuery().eq(AdminRole::getName, "企业负责人").one();
-        if (adminRole != null) {
-            adminUser.setRoleId(adminRole.getAdminRoleId());
-            adminUser.setRoleName(adminRole.getName());
-            adminUser.updateById();
+    private void dataPermissionsHandle(AdminUserAddReqBean adminUser, List<AdminUserPermissions> permissions) {
+        if (CollectionUtil.isEmpty(permissions)) {
+            throw new RemoteServiceException("请选择至少1个数据权限");
         }
 
-        int count1 = adminCompanyWechatService.count();
-        AdminCompanyWechat adminCompanyWechat = new AdminCompanyWechat();
-        BeanUtils.copyProperties(adminUser, adminCompanyWechat);
-        adminCompanyWechat.setCompanyName(adminUser.getNickName());
-        adminCompanyWechat.setAgentId2((count1 + 1) * 2);
-        adminCompanyWechat.setAgentId3((count1 + 1) * 3);
-        adminCompanyWechat.setCreateTime(new Date());
-        adminCompanyWechat.setCreateBy(createBy);
-        adminCompanyWechat.insert();
-
+        final List<String> deptList = permissions.stream()
+                .filter(AdminUserPermissions::getIsDept)
+                .map(AdminUserPermissions::getPermissionsId)
+                .collect(Collectors.toList());
 
-        adminUser.setCompanyWechatId(adminCompanyWechat.getCompanyWechatId());
-        adminUser.setCompanyName(adminCompanyWechat.getCompanyName());
-        adminUser.updateById();
+        final List<AdminDept> deptExistList = adminDeptService.lambdaQuery()
+                .in(AdminDept::getAdminDeptId, deptList)
+                .list();
 
-//        AdminWebsit adminWebsit = adminWebsitService.lambdaQuery()
-//                .eq(AdminWebsit::getCorpId, adminCompanyWechat.getCorpId())
-//                .eq(AdminWebsit::getWebsitId, 1).one();
-//
-//        AdminUserWebsitRela adminUserWebsitRela = new AdminUserWebsitRela();
-//        adminUserWebsitRela.setAdminUserId(adminUser.getAdminUserId());
-//        adminUserWebsitRela.setAdminWebsitId(adminWebsit.getId());
-//        adminUserWebsitRela.setCreateTime(new Date());
-//        adminUserWebsitRela.insert();
-        //刷新配置
-        commonLogic.reloadWxConfig();
-    }
-
-    //添加用户部门关系
-    private void addAdminUserWebsit(AdminUserAddReqBean adminUser) {
-        //先清除
-        if (CollectionUtils.isEmpty(adminUser.getAdminWebsitIds())) {
-            return;
-        }
-        adminUserWebsitRelaService.lambdaUpdate().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).remove();
-        List<AdminWebsit> websits = adminWebsitService.lambdaQuery().in(AdminWebsit::getId, adminUser.getAdminWebsitIds()).list();
-        if (websits.size() == 0) {
-            throw new RemoteServiceException("请选择至少1个部门");
-        }
-        log.info("【添加用户部门关系】:{}", com.alibaba.fastjson.JSONObject.toJSONString(adminUser));
-        for (AdminWebsit adminWebsit : websits) {
-            AdminUserWebsitRela adminUserWebsitRela = new AdminUserWebsitRela();
-            adminUserWebsitRela.setAdminUserId(adminUser.getAdminUserId());
-            adminUserWebsitRela.setAdminWebsitId(adminWebsit.getId());
-            adminUserWebsitRela.setCompanyWechatId(adminUser.getCompanyWechatId());
-            adminUserWebsitRela.setCreateTime(new Date());
-            adminUserWebsitRela.insert();
+        if (deptExistList.size() < deptList.size()) {
+            throw new RemoteServiceException("选择里有异常部门");
         }
 
-    }
-
-    /**
-     * 修改帐号
-     */
-    public void update(HttpServletRequest request, AdminUserAddReqBean newUser) {
+        final List<String> websitList = permissions.stream()
+                .filter(v -> !v.getIsDept())
+                .map(AdminUserPermissions::getPermissionsId)
+                .collect(Collectors.toList());
 
-        AdminUserCom admin = commonLogic.getAdminUser(request);
+        final List<AdminWebsit> websitExistList = adminWebsitService.lambdaQuery()
+                .in(AdminWebsit::getWebsitId, websitList)
+                .list();
 
-        AdminUser oldUser = null;
-        if (StringUtils.isEmpty(newUser.getAdminUserId()) ||
-                (oldUser = adminUserService.getById(newUser.getAdminUserId())) == null) {
-            throw new RemoteServiceException("请选择用户");
+        if (websitExistList.size() < websitList.size()) {
+            throw new RemoteServiceException("选择里有异常商家");
         }
 
-        //需要用户roleId
-        AdminRole loginRole = adminRoleService.getById(admin.getRoleId());
-        AdminRole addUserRole = null;
-        if (StringUtils.isEmpty(newUser.getRoleId()) || (addUserRole = adminRoleService.getById(newUser.getRoleId())) == null) {
-            throw new RemoteServiceException("请为用户选择角色");
-        }
-        //  添加用户的角色级别 <= 被添加的用户的角色级别
-        if (loginRole.getType() <= addUserRole.getType()) {
-            throw new RemoteServiceException("无法为用户赋予与自身级别相当的角色");
-        }
-
-        //部门账号
-        if (newUser.getType() == 0) {
-            //默认登录用户的CompanyWechatId (admin则无)
-            newUser.setCompanyWechatId(admin.getCompanyWechatId());
-            newUser.setCompanyName(admin.getCompanyName());
-        }
-        newUser.setUserName(null);
-        newUser.setPassword(StringUtils.isEmpty(newUser.getPassword()) ? null : MD5Utils.md5(newUser.getPassword()));
-
-        newUser.updateById();
-
-        if (newUser.getType() != (addUserRole.getType() - 1)) {
-            throw new RemoteServiceException("所选角色级别和用户级别不一致!!");
-        }
+        // 清空权限关系
+        adminUserPermissionsRelaService.lambdaUpdate()
+                .eq(AdminUserPermissionsRela::getAdminUserId, adminUser.getAdminUserId())
+                .remove();
 
-        //当前为公司主账号
-        if (newUser.getType() == 1) {
-            //删除部门关系
-            adminUserWebsitRelaService.lambdaUpdate().eq(AdminUserWebsitRela::getAdminUserId, newUser.getAdminUserId()).remove();
-            //删除企业关系
-            adminUserCompanyRelaService.lambdaUpdate().eq(AdminUserCompanyRela::getAdminUserId, newUser.getAdminUserId()).remove();
-            //新增用户企业关系
-            AdminUserCompanyRela adminUserCompanyRela = new AdminUserCompanyRela();
-            adminUserCompanyRela.setAdminUserId(newUser.getAdminUserId());
-            adminUserCompanyRela.setCompanyWechatId(newUser.getCompanyWechatId());
-            adminUserCompanyRela.setCompanyName(newUser.getCompanyName());
-            adminUserCompanyRela.setCreateTime(new Date());
-            adminUserCompanyRela.insert();
+        List<AdminUserPermissionsRela> relaList = new ArrayList<>();
+        for (AdminDept adminDept : deptExistList) {
+            AdminUserPermissionsRela rela = new AdminUserPermissionsRela();
+            rela.setAdminUserId(adminUser.getAdminUserId())
+                    .setAdminUserPermissionsId(adminDept.getAdminDeptId())
+                    .setCompanyWechatId(adminDept.getCompanyWechatId())
+                    .setIsDept(true);
+            relaList.add(rela);
         }
-
-        //当前为为部门账号
-        if (newUser.getType() == 0) {
-            //添加部门
-            this.addAdminUserWebsit(newUser);
-            //删除企业关系
-            adminUserCompanyRelaService.lambdaUpdate().eq(AdminUserCompanyRela::getAdminUserId, newUser.getAdminUserId()).remove();
-            //todo admin添加的部门没有companyWechatId
+        for (AdminWebsit adminWebsit : websitExistList) {
+            AdminUserPermissionsRela rela = new AdminUserPermissionsRela();
+            rela.setAdminUserId(adminUser.getAdminUserId())
+                    .setAdminUserPermissionsId(adminWebsit.getWebsitId())
+                    .setCompanyWechatId(adminWebsit.getCompanyWechatId())
+                    .setIsDept(false);
+            relaList.add(rela);
         }
 
+        adminUserPermissionsRelaService.saveBatch(relaList);
     }
 
 
@@ -362,7 +269,7 @@ public class AdminUserLogic {
         IPage<AdminUser> page = adminUserService.lambdaQuery()
                 .eq(StringUtils.isNotEmpty(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyWechatId, adminUser.getAdminCompanyIds())
                 .like(StringUtils.isNotEmpty(userName), AdminUser::getUserName, userName).page(new Page<>(pageNum, pageSize));
         return page;
     }
@@ -406,27 +313,15 @@ public class AdminUserLogic {
      * @param adminUserId
      * @return
      */
-    public AdminUserBean detail(String adminUserId) {
+    public AdminUserCom detail(String adminUserId) {
         AdminUser adminUser = adminUserService.getById(adminUserId);
-        AdminUserBean adminUserBean = new AdminUserBean();
+        AdminUserCom adminUserBean = new AdminUserCom();
         BeanUtils.copyProperties(adminUser, adminUserBean);
 
-        List<AdminUserCompanyRela> list = adminUserCompanyRelaService.lambdaQuery().eq(AdminUserCompanyRela::getAdminUserId, adminUser.getAdminUserId()).list();
-        if (list.size() > 0) {
-            String companyWechatId = list.get(0).getCompanyWechatId();
-            AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(companyWechatId);
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(adminCompanyWechat.getRefundPassword())) {
-                adminUserBean.setIsRefundPassword(Boolean.TRUE);
-            }
-
-            BeanUtils.copyProperties(adminCompanyWechat, adminUserBean);
-            return adminUserBean;
-        }
-        List<AdminUserWebsitRela> websitIds = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).list();
-        if (websitIds.size() > 0) {
-            List<String> collect = websitIds.stream().map(AdminUserWebsitRela::getAdminWebsitId).collect(Collectors.toList());
-            adminUserBean.setAdminWebsitIds(collect);
-        }
+        final List<AdminUserPermissionsRela> permissionsRelas = adminUserPermissionsRelaService.lambdaQuery()
+                .eq(AdminUserPermissionsRela::getAdminUserId, adminUser.getAdminUserId())
+                .list();
+        adminUserBean.setPermissions(permissionsRelas);
 
         return adminUserBean;
     }
@@ -591,7 +486,7 @@ public class AdminUserLogic {
             adminUser.setLastLoginTime(new Date());
             adminUser.updateById();
 
-            AdminUserBean adminUserBean = new AdminUserBean();
+            AdminUserCom adminUserBean = new AdminUserCom();
             BeanUtils.copyProperties(adminUser, adminUserBean);
             //不返回密码
             adminUserBean.setPassword(null);

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

@@ -1,6 +1,5 @@
 package com.gree.mall.manager.logic.admin;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
@@ -9,22 +8,18 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.admin.ew.EnterpriseWechatWorkerLogic;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.WorkWechatLogic;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.AdminZone;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.AdminZoneService;
-import com.gree.mall.manager.plus.service.EnterpriseWechatWorkerService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -97,7 +92,7 @@ public class AdminWebsitLogic {
 
         //Long aLong = workWechatLogic.addOrganization(adminWebsit.getName(), adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
         String aLong = IdWorker.getIdStr();
-        adminWebsit.setId(aLong+"");
+        adminWebsit.setWebsitId(aLong+"");
 //        adminWebsit.setCorpId(adminUser.getCorpIds().get(0));
         adminWebsit.setWebsitId(aLong);
         adminWebsit.insert();
@@ -112,7 +107,7 @@ public class AdminWebsitLogic {
         //AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         Integer count = adminWebsitService.lambdaQuery()
-                .ne(AdminWebsit::getId,adminWebsit.getId())
+                .ne(AdminWebsit::getWebsitId,adminWebsit.getWebsitId())
                 .and(v -> v.eq(AdminWebsit::getWebsitNumber,adminWebsit.getWebsitNumber())
                         .or()
                         .eq(AdminWebsit::getName, adminWebsit.getName())

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

@@ -29,7 +29,7 @@ public class OperationLogLogic {
      */
     public IPage<OperationLog> listPage(HttpServletRequest request,String moduleName, String startTime, String endTime, Integer pageNo, Integer pageSize){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return operationLogService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds),OperationLog::getCompanyWechatId,companyWechatIds)
@@ -45,7 +45,7 @@ public class OperationLogLogic {
      */
     public List<String> moduleList(HttpServletRequest request){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         List<OperationLog> distinctModuleName = operationLogService.lambdaQuery()
                 .select(OperationLog::getModuleName)

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

@@ -1,11 +1,9 @@
 package com.gree.mall.manager.logic.common;
 
-import cn.binarywang.wx.miniapp.bean.scheme.WxMaGenerateSchemeRequest;
 import com.alibaba.fastjson.JSON;
 import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.config.wx.WxConfiguration;
 import com.gree.mall.manager.constant.Constant;
@@ -16,6 +14,7 @@ import com.gree.mall.manager.utils.ApplicationContextUtils;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.RedisUtil;
 import com.gree.mall.manager.utils.oss.OSSUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang.time.DateUtils;
@@ -27,7 +26,6 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,13 +34,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class CommonLogic {
 
     @Value("${spring.profiles.active}")
@@ -54,164 +52,101 @@ public class CommonLogic {
     @Value("${wechat.keyPath}")
     private String keyPath;
 
-    @Autowired
-    WechatLogic wechatLogic;
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    AdminCompanyWechatService AdminCompanyWechatService;
-    @Autowired
-    CommonFileService commonFileService;
-    @Autowired
-    OrderInfoService orderInfoService;
-    @Autowired
-    RegionService regionService;
-    @Autowired
-    AdminUserService adminUserService;
-    @Autowired
-    AdminUserCompanyRelaService adminUserCompanyRelaService;
-    @Autowired
-    AdminCompanyWechatService adminCompanyWechatService;
-    @Autowired
-    AdminUserWebsitRelaService adminUserWebsitRelaService;
-    @Autowired
-    AdminMapper adminMapper;
-
-
-    public AdminUserCom getAdminUser(){
+    private final RedisUtil redisUtil;
+
+    private final AdminCompanyWechatService AdminCompanyWechatService;
+
+    private final CommonFileService commonFileService;
+
+    private final RegionService regionService;
+
+    private final AdminUserService adminUserService;
+
+    private final AdminCompanyWechatService adminCompanyWechatService;
+
+    private final AdminMapper adminMapper;
+
+    private final AdminUserPermissionsRelaService adminUserPermissionsRelaService;
+
+    private final WechatLogic wechatLogic;
+
+
+    public AdminUserCom getAdminUser() {
         HttpServletRequest request = ApplicationContextUtils.getHttpServletRequest();
         return this.getAdminUser(request);
     }
 
     /**
-     * 获取帐号以及部门id集合
+     * 获取帐号信息
      */
-    public AdminUserCom getAdminUser(HttpServletRequest request){
+    public AdminUserCom getAdminUser(HttpServletRequest request) {
         String userId = CommonUtils.getUserId(request);
         //方便测试用
-        if(userId == null && !active.equals("prd")){
+        if (userId == null && !active.equals("prd")) {
             AdminUser admin = adminUserService.lambdaQuery().eq(AdminUser::getUserName, "admin").one();
             AdminUserCom adminUserCom = new AdminUserCom();
-            BeanUtils.copyProperties(admin,adminUserCom);
+            BeanUtils.copyProperties(admin, adminUserCom);
             return adminUserCom;
         }
         AdminUser adminUser = adminUserService.getById(userId);
-        if(adminUser == null || !adminUser.getStatus()){
+        if (adminUser == null || !adminUser.getStatus()) {
             throw new RemoteServiceException("帐号不存在或已被禁用");
         }
         AdminUserCom adminUserCom = new AdminUserCom();
-        BeanUtils.copyProperties(adminUser,adminUserCom);
+        BeanUtils.copyProperties(adminUser, adminUserCom);
 
-        //企业负责人/超管
-        AdminUserCom account = this.companyAccount(adminUserCom);
-        if(account != null){
-            return account;
-        }
-        //部门帐号
-        AdminUserCom account2 = this.websitAccount(adminUserCom,request);
-        if(account2 != null){
-            return account2;
-        }
-        //不过滤权限
-        adminUserCom.setAdminWebsitIds(null);
         return adminUserCom;
     }
 
     /**
-     * 超管用户，企业主帐号
-     */
-    public AdminUserCom companyAccount(AdminUserCom adminUser){
-        if(adminUser.getType() != 0){
-            //非超管
-            if(!adminUser.getUserName().equals("admin")) {
-                String adminUserId = adminUser.getAdminUserId();
-                //查询该用户拥有的部门权限
-                //List<AdminUserCompanyRela> list = adminUserCompanyRelaService.lambdaQuery().eq(AdminUserCompanyRela::getAdminUserId, adminUser.getAdminUserId()).list();
-                List<AdminCompanyWechat> list = adminMapper.queryAdminCompanyWechat(adminUserId);
-                if (CollectionUtils.isEmpty(list)) {
-                    throw new RemoteServiceException("暂无授权，请联系管理员");
-                }
-                List<String> companyWechatIds = list.stream().map(AdminCompanyWechat::getCompanyWechatId).distinct().collect(Collectors.toList());
-                List<String> corpIds = list.stream().map(AdminCompanyWechat::getCorpId).collect(Collectors.toList());
-
-                adminUser.setCompanyWechatIds(companyWechatIds);
-                adminUser.setOnlyRead(companyWechatIds.size() > 1);
-                if (companyWechatIds.size() == 1) {
-                    AdminCompanyWechat adminCompanyWechat = list.get(0);
-                    adminUser.setLoginCompanyWechatId(adminCompanyWechat.getCompanyWechatId());
-                    adminUser.setLoginCompanyName(adminCompanyWechat.getCompanyName());
-                    adminUser.setAdminCompanyWechat(adminCompanyWechat);
-                }
-                adminUser.setCompanyWechatId(companyWechatIds.get(0));
-            }
-            return adminUser;
-        }
-        return null;
-    }
-
-
-    /**
-     * 部门帐号
+     * 查询用户系统关系
      */
-    public AdminUserCom websitAccount(AdminUserCom adminUserCom,HttpServletRequest request){
+    public AdminUserCom queryUserSysRela(AdminUserCom adminUserCom) {
         String userId = adminUserCom.getAdminUserId();
-        List<AdminUserWebsitRela> websitList = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, userId).list();
-//        if(CollectionUtils.isEmpty(websitList)){
-//            throw new RemoteServiceException("暂无授权,请联系管理员");
-//        }
-        List<String> adminWebsitIds = websitList.stream().map(AdminUserWebsitRela::getAdminWebsitId).distinct().collect(Collectors.toList());
-        List<String> companyWechatIds = websitList.stream().map(AdminUserWebsitRela::getCompanyWechatId).distinct().collect(Collectors.toList());
-        adminUserCom.setCompanyWechatIds(companyWechatIds);
-        adminUserCom.setAdminWebsitIds(adminWebsitIds);
-        adminUserCom.setOnlyRead(companyWechatIds.size() > 1);
-
-        String loginCompanyWechatId = "";
-        String loginCompanyName = "";
-        if(companyWechatIds.size() == 1){
-            loginCompanyWechatId = websitList.get(0).getCompanyWechatId();
-            AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(loginCompanyWechatId);
-            loginCompanyName = adminCompanyWechat.getCompanyName();
-        }
-        //获取当前登录人选用的企业微信身份
 
-        if(StringUtils.isEmpty(loginCompanyWechatId)){
-            loginCompanyWechatId = request.getHeader("loginCompanyWechatId");
-        }
-        if(StringUtils.isEmpty(loginCompanyWechatId)){
-            loginCompanyWechatId = request.getParameter("loginCompanyWechatId");
-        }
-        if(StringUtils.isEmpty(loginCompanyName)){
-            loginCompanyName = request.getHeader("loginCompanyName");
-        }
-        if(StringUtils.isEmpty(loginCompanyName)){
-            loginCompanyName = request.getParameter("loginCompanyName");
-        }
-
-        if(StringUtils.isNotEmpty(loginCompanyWechatId)) {
+        // 商户
+        final List<AdminUserPermissionsRela> permissionsRelas = adminUserPermissionsRelaService.lambdaQuery()
+                .eq(AdminUserPermissionsRela::getAdminUserId, userId)
+                .list();
+        final List<String> companyList = permissionsRelas.stream()
+                .map(AdminUserPermissionsRela::getCompanyWechatId)
+                .distinct()
+                .collect(Collectors.toList());
+        adminUserCom.setAdminCompanyIds(companyList);
+
+        // 商家
+        final List<String> websitList = permissionsRelas.stream()
+                .filter(v -> !v.getIsDept())
+                .map(AdminUserPermissionsRela::getAdminUserPermissionsId)
+                .distinct()
+                .collect(Collectors.toList());
+        adminUserCom.setAdminWebsitIds(websitList);
+
+        // 部门
+        final List<String> deptList = permissionsRelas.stream()
+                .filter(AdminUserPermissionsRela::getIsDept)
+                .map(AdminUserPermissionsRela::getAdminUserPermissionsId)
+                .distinct()
+                .collect(Collectors.toList());
+        adminUserCom.setAdminDeptIds(deptList);
+
+        adminUserCom.setOnlyRead(companyList.size() > 1);
 
-            if (!adminUserCom.getCompanyWechatIds().contains(loginCompanyWechatId)) {
-                throw new RemoteServiceException("暂无权限");
-            }
-            adminUserCom.setLoginCompanyWechatId(loginCompanyWechatId);
-            adminUserCom.setLoginCompanyName(loginCompanyName);
-            //获取当前登录人的企业微信配置
-            AdminCompanyWechat adminCompanyWechat = this.getAdminCompanyWechat(loginCompanyWechatId);
-            adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
-        }
         return adminUserCom;
     }
 
     /**
      * 获取企业微信配置
      */
-    public AdminCompanyWechat getAdminCompanyWechat(String companyWechatId){
+    public AdminCompanyWechat getAdminCompanyWechat(String companyWechatId) {
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(companyWechatId);
         return adminCompanyWechat;
     }
+
     /**
      * 获取所有企业微信配置
      */
-    public List<AdminCompanyWechat> getAdminCompanyList(){
+    public List<AdminCompanyWechat> getAdminCompanyList() {
         List<AdminCompanyWechat> list = adminCompanyWechatService.list();
         return list;
     }
@@ -219,29 +154,29 @@ public class CommonLogic {
     /**
      * 刷新微信相关配置
      */
-    public void reloadWxConfig(){
+    public void reloadWxConfig() {
         List<AdminCompanyWechat> list = AdminCompanyWechatService.list();
         log.info("【刷新微信配置开始】");
-        WxConfiguration.reloadWxConfig(list,redisUtil,keyPath,notifyUrl);
+        WxConfiguration.reloadWxConfig(list, redisUtil, keyPath, notifyUrl);
         log.info("【刷新微信配置成功】");
     }
 
     /**
      * 附件归属绑定
      */
-    public void bindFile(String objId,String objType,List<String> fileIds){
+    public void bindFile(String objId, String objType, List<String> fileIds) {
         //先删除后绑定
         commonFileService.lambdaUpdate()
-                .eq(CommonFile::getObjId,objId)
-                .eq(CommonFile::getObjType,objType)
-                .notIn(CommonFile::getId,fileIds).remove();
+                .eq(CommonFile::getObjId, objId)
+                .eq(CommonFile::getObjType, objType)
+                .notIn(CommonFile::getId, fileIds).remove();
 
-        for(int i =0;i< fileIds.size();i++) {
+        for (int i = 0; i < fileIds.size(); i++) {
             //这里分开每次存储的时候，每个图片创建时间加1秒，方便图片排序用
             commonFileService.lambdaUpdate()
                     .set(CommonFile::getObjId, objId)
                     .set(CommonFile::getObjType, objType)
-                    .set(CommonFile::getCreateTime,DateUtils.addSeconds(new Date(),i))
+                    .set(CommonFile::getCreateTime, DateUtils.addSeconds(new Date(), i))
                     .eq(CommonFile::getId, fileIds.get(i))
                     .update();
         }
@@ -250,10 +185,10 @@ public class CommonLogic {
     /**
      * 查询附件列表
      */
-    public List<CommonFile> queryFileByObjId(String objId,String objType){
+    public List<CommonFile> queryFileByObjId(String objId, String objType) {
         return commonFileService.lambdaQuery()
-                .eq(CommonFile::getObjId,objId)
-                .eq(CommonFile::getObjType,objType)
+                .eq(CommonFile::getObjId, objId)
+                .eq(CommonFile::getObjType, objType)
                 .orderByAsc(CommonFile::getCreateTime)
                 .list();
     }
@@ -261,9 +196,9 @@ public class CommonLogic {
     /**
      * 查询附件列表
      */
-    public List<String> queryFileUrlsByObjId(String objId,String objType){
+    public List<String> queryFileUrlsByObjId(String objId, String objType) {
         List<CommonFile> commonFiles = this.queryFileByObjId(objId, objType);
-        if(commonFiles.size() == 0){
+        if (commonFiles.size() == 0) {
             return null;
         }
         return commonFiles.stream().map(CommonFile::getUrl).collect(Collectors.toList());
@@ -272,11 +207,12 @@ public class CommonLogic {
 
     /**
      * 上传附件
+     *
      * @param file
      * @return
      * @throws IOException
      */
-    public CommonFile uploadFile( MultipartFile file) throws IOException, RemoteServiceException {
+    public CommonFile uploadFile(MultipartFile file) throws IOException, RemoteServiceException {
 
         if (file == null || file.isEmpty()) {
             return null;
@@ -316,8 +252,8 @@ public class CommonLogic {
     }
 
 
-    public List<Region> queryRegionList(Long pid){
-        return regionService.lambdaQuery().eq(Region::getPid,pid).list();
+    public List<Region> queryRegionList(Long pid) {
+        return regionService.lambdaQuery().eq(Region::getPid, pid).list();
     }
 
     public String getFile(String key, HttpServletResponse response) throws IOException {
@@ -325,20 +261,20 @@ public class CommonLogic {
         return url;
     }
 
-    public String getUrlScheme(String query,String companyWechatId) throws IOException, WxErrorException {
-        if(StringUtils.isEmpty(companyWechatId)){
+    public String getUrlScheme(String query, String companyWechatId) throws IOException, WxErrorException {
+        if (StringUtils.isEmpty(companyWechatId)) {
             companyWechatId = Constant.GD_COMPANY_WECHAT_ID;
         }
         String accessToken = wechatLogic.getMaService(companyWechatId).getAccessToken();
-        HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/generatescheme?access_token="+accessToken);
-        httpPost.setHeader("Content-Type","application/json; charset=utf-8");
-        httpPost.setConfig(RequestConfig.custom().setConnectTimeout(10*1000).build());
+        HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/generatescheme?access_token=" + accessToken);
+        httpPost.setHeader("Content-Type", "application/json; charset=utf-8");
+        httpPost.setConfig(RequestConfig.custom().setConnectTimeout(10 * 1000).build());
 
-        TreeMap<String,String>  jump_wxa=new TreeMap<>();
-        jump_wxa.put("query",query);
+        TreeMap<String, String> jump_wxa = new TreeMap<>();
+        jump_wxa.put("query", query);
 
-        TreeMap<String,Object> treeMap=new TreeMap<>();
-        treeMap.put("jump_wxa",jump_wxa);
+        TreeMap<String, Object> treeMap = new TreeMap<>();
+        treeMap.put("jump_wxa", jump_wxa);
         treeMap.put("is_expire", true);
         treeMap.put("expire_type", 1);
         treeMap.put("expire_interval", 7);
@@ -346,23 +282,23 @@ public class CommonLogic {
 
         HttpResponse httpResponse = HttpClientBuilder.create().build().execute(httpPost);
         String s = EntityUtils.toString(httpResponse.getEntity());
-        if(httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK){
-            log.info("调用微信接口失败:"+httpPost.getURI());
-            log.info("返回数据："+s);
+        if (httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+            log.info("调用微信接口失败:" + httpPost.getURI());
+            log.info("返回数据：" + s);
             throw new RuntimeException("调用微信接口失败");
         }
-        log.info("调用微信接口成功:"+httpPost.getURI());
-        log.info("微信接口返回数据："+s);
+        log.info("调用微信接口成功:" + httpPost.getURI());
+        log.info("微信接口返回数据：" + s);
 
-        try{
+        try {
             return JSON.parseObject(s).get("openlink").toString();
-        }catch (NullPointerException e){
+        } catch (NullPointerException e) {
             return s;
         }
     }
 
     public String getFileGet(String key) {
-        String url = OSSUtil.getUrlWw(key,null);
+        String url = OSSUtil.getUrlWw(key, null);
         return url;
     }
 

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

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.logic.common;
 
 import cn.hutool.core.convert.Convert;
-import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -9,20 +8,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.common.SysDictCompanyVO;
 import com.gree.mall.manager.commonmapper.AdminMapper;
-import com.gree.mall.manager.constant.SysDictConstant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.plus.entity.SysDictCompany;
 import com.gree.mall.manager.plus.entity.SysDictTypeCompany;
 import com.gree.mall.manager.plus.service.SysDictCompanyService;
 import com.gree.mall.manager.plus.service.SysDictTypeCompanyService;
-import com.gree.mall.manager.utils.RedisUtil;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,7 +59,7 @@ public class SysDictCompanyLogic {
     public IPage<SysDictCompanyVO> sysDictIPage(ZfireParamBean zfireParamBean) {
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         IPage<SysDictCompanyVO> sysDictIPage = adminMapper.sysDictCompanyList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParam
                 , companyWechatIds);

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

@@ -27,6 +27,7 @@ import com.gree.mall.manager.plus.entity.OrderShare;
 import com.gree.mall.manager.plus.entity.OrderSharePayInfo;
 import com.gree.mall.manager.plus.service.OrderSharePayInfoService;
 import com.gree.mall.manager.utils.*;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
@@ -54,13 +55,9 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
+@RequiredArgsConstructor
 public class WechatLogic {
 
-    @Autowired
-    RedisUtil redisUtil;
-    @Autowired
-    OrderShareLogic orderShareLogic;
-
     public WxPayService getPayService(String companyWechatId){
         return WxConfiguration.wxPayServices.get(companyWechatId);
     }

src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -12,21 +12,17 @@ import com.gree.mall.manager.enums.OrderStatusEnum;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
-import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.java2d.pipe.SpanShapeRenderer;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 public class CountLogic {
@@ -55,15 +51,15 @@ public class CountLogic {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //累计售出商品数量，已售中商品数量，待发货订单数量，维权中订单数量，今日订单数，昨日订单数，今日收益，昨日收益
-        CountBean countBean = countMapper.countInfo(adminUser.getCompanyWechatIds());
+        CountBean countBean = countMapper.countInfo(adminUser.getAdminCompanyIds());
         //今日访客
-        Integer todayVisit = countMapper.countVisit(sdf.format(DateUtils.getStartTime()),sdf.format(DateUtils.getEndTime()),adminUser.getCompanyWechatIds());
+        Integer todayVisit = countMapper.countVisit(sdf.format(DateUtils.getStartTime()),sdf.format(DateUtils.getEndTime()),adminUser.getAdminCompanyIds());
         //昨日访客
-        Integer yestodayVisit = countMapper.countVisit(sdf.format(DateUtils.getBeginDayOfYesterday()),sdf.format(DateUtils.getEndDayOfYesterDay()),adminUser.getCompanyWechatIds());
+        Integer yestodayVisit = countMapper.countVisit(sdf.format(DateUtils.getBeginDayOfYesterday()),sdf.format(DateUtils.getEndDayOfYesterDay()),adminUser.getAdminCompanyIds());
         //查询待结算金额
         List<OrderShare> list = orderShareService.lambdaQuery()
                 .eq(OrderShare::getStatus, OrderShareStatusEnum.ING.toString())
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderShare::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),OrderShare::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 //.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderShare::getWebsitId,adminUser.getAdminWebsitIds())
                 .list();
         BigDecimal totalShareAmount = list.stream().map(OrderShare::getAmount).reduce(BigDecimal::add).orElse(new BigDecimal(0));
@@ -86,7 +82,7 @@ public class CountLogic {
         Date startTime = this.getStartTime(flag);
         Date endTime = this.getEndTime(flag);
         List<GoodsRankBean> goodsRankBeans = countMapper.countGoodsRank(sdf.format(startTime), sdf.format(endTime),
-                adminUserCom.getCompanyWechatIds(),adminUserCom.getAdminWebsitIds());
+                adminUserCom.getAdminCompanyIds(),adminUserCom.getAdminWebsitIds());
         return goodsRankBeans;
     }
 
@@ -100,10 +96,10 @@ public class CountLogic {
         Date startTime = this.getStartTime(flag);
         Date endTime = this.getEndTime(flag);
         CountOrderBean countOrderBean = countMapper.countSaleOrder(DateUtils.formatDate(startTime), DateUtils.formatDate(endTime), type,
-                adminUserCom.getCompanyWechatIds(),adminUserCom.getAdminWebsitIds());
+                adminUserCom.getAdminCompanyIds(),adminUserCom.getAdminWebsitIds());
         //各时段统计
         List<OrderInfo> list = orderInfoService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUserCom.getCompanyWechatIds()),OrderInfo::getCompanyWechatId,adminUserCom.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUserCom.getAdminCompanyIds()),OrderInfo::getCompanyWechatId,adminUserCom.getAdminCompanyIds())
                 .notIn(OrderInfo::getOrderStatus,Arrays.asList(OrderStatusEnum.CLOSE.toString(),OrderStatusEnum.NOPAY.toString(),OrderStatusEnum.TIMEOUT.toString()))
                 .between(OrderInfo::getCreateTime, startTime, endTime).list();
         SimpleDateFormat hh = new SimpleDateFormat("HH");
@@ -151,7 +147,7 @@ public class CountLogic {
      */
     public List<Map<String,Object>> queryWorkAmount(String startTime,String endTime,HttpServletRequest request){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<Map<String, Object>> maps = countMapper.countWorkAmount(startTime, endTime,adminUser.getCompanyWechatIds());
+        List<Map<String, Object>> maps = countMapper.countWorkAmount(startTime, endTime,adminUser.getAdminCompanyIds());
         return maps;
     }
 

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -1,14 +1,12 @@
 package com.gree.mall.manager.logic.coupon;
 
 import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.coupon.*;
-import com.gree.mall.manager.bean.member.MemberBean;
 import com.gree.mall.manager.commonmapper.CouponDateMapper;
 import com.gree.mall.manager.commonmapper.SecKillMapper;
 import com.gree.mall.manager.commonmapper.WxCustomerMapper;
@@ -18,24 +16,19 @@ import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.DateUtils;
-import com.gree.mall.manager.utils.IdWorker;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.crypto.Data;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -72,7 +65,7 @@ public class CouponLogic {
      */
     public IPage<CouponPageBean> page(String couponName, String couponType, String flag, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return couponDateMapper.pageCoupon(new Page<>(pageNum, pageSize), companyWechatIds, couponName, couponType, flag);
     }
@@ -80,7 +73,7 @@ public class CouponLogic {
 
     public void export(HttpServletRequest request, HttpServletResponse response, String couponName, String couponType, String flag) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         List<CouponExportBean> couponExportBeans = couponDateMapper.exportCoupon(companyWechatIds, couponName, couponType, flag);
         //List<CouponExportBean> couponSelfBeans =  couponDateMapper.exportSelfCoupon(companyWechatIds, couponName, couponType, flag);
@@ -560,7 +553,7 @@ public class CouponLogic {
                                 String tel, Date registerTime, String keyword, String type, Integer pageNo, Integer pageSize) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return userService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyWechatId, companyWechatIds)
@@ -575,7 +568,7 @@ public class CouponLogic {
     public IPage<CustomSecSpecBean> goodsSpecList(HttpServletRequest request, String categoryId, String keyword, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        return secKillMapper.querySpecListforCoupon(new Page<>(pageNum, pageSize), adminUser.getCompanyWechatIds(), categoryId, keyword);
+        return secKillMapper.querySpecListforCoupon(new Page<>(pageNum, pageSize), adminUser.getAdminCompanyIds(), categoryId, keyword);
     }
 
 

src/main/java/com/gree/mall/manager/logic/exchange/ExchangeLogic.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.EnterpriseWechatWorkerImportList;
 import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
 import com.gree.mall.manager.commonmapper.CountMapper;
 import com.gree.mall.manager.enums.ExchangeCodeTypeEnum;
@@ -43,7 +42,7 @@ public class ExchangeLogic {
     public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(String keyword, String adminWebsitId, Integer pageNo, Integer pageSize, HttpServletRequest request){
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = countMapper
-                .queryExchangeCodeCountList(new Page(pageNo, pageSize), keyword, adminWebsitId, adminUser.getCompanyWechatIds());
+                .queryExchangeCodeCountList(new Page(pageNo, pageSize), keyword, adminWebsitId, adminUser.getAdminCompanyIds());
         return giftExchangeCodeBeanIPage;
     }
 

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

@@ -1,6 +1,5 @@
 package com.gree.mall.manager.logic.goods;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.GoodsCategoryBean;
 import com.gree.mall.manager.commonmapper.CustomGoodsCategoryMapper;
@@ -17,7 +16,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Component
@@ -40,7 +38,7 @@ public class GoodsCategoryLogic {
     public List<GoodsCategoryBean> list(Integer level, String name, Boolean status, HttpServletRequest request) {
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
 
         return customGoodsCategoryMapper.list(level, status, name, companyWechatIds);

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

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.*;
-import com.gree.mall.manager.bean.order.OrderDetailListBean;
 import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
 import com.gree.mall.manager.commonmapper.GoodsCheckMapper;
 import com.gree.mall.manager.constant.Constant;
@@ -113,7 +112,7 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         String sortStr = null;
         if (goodsSortJson != null && !goodsSortJson.trim().equals("")) {
@@ -164,7 +163,7 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         String sortStr = null;
         if (goodsSortJson != null && !goodsSortJson.trim().equals("")) {
@@ -193,7 +192,7 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null, null, null,
@@ -751,7 +750,7 @@ public class GoodsLogic {
     public GoodsTypeCount countByType(HttpServletRequest request) {
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         GoodsTypeCount goodsTypeCount = customGoodsMapper.countByType(companyWechatIds);
         //查询已售罄的商品数量

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

@@ -19,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,7 +46,7 @@ public class GoodsNewsCategoryLogic {
      */
     public IPage<GoodsNewsCategory> pageGoodsNewsCategory(HttpServletRequest request, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return goodsNewsCategoryService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsNewsCategory::getCompanyWechatId, companyWechatIds)

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

@@ -34,7 +34,7 @@ public class GoodsTagLogic {
      */
     public IPage<GoodsTag> pageGoodsTag(HttpServletRequest request, Integer pageNum, Integer pageSize,Integer type) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return goodsTagService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsTag::getCompanyWechatId, companyWechatIds)

src/main/java/com/gree/mall/manager/logic/marketing/DynamicMaterialsLogic.java

@@ -3,14 +3,11 @@ package com.gree.mall.manager.logic.marketing;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.marketing.DynamicMaterialsDetailsBean;
 import com.gree.mall.manager.bean.marketing.DynamicMaterialsPageBean;
 import com.gree.mall.manager.bean.marketing.DynamicMaterialsVisitStatisticsBean;
 import com.gree.mall.manager.commonmapper.MarketingMaterialsVisitCustomMapper;
-import com.gree.mall.manager.config.wx.WxConfiguration;
 import com.gree.mall.manager.enums.MarketingMaterialsTypeEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -23,10 +20,8 @@ import com.gree.mall.manager.plus.service.MarketingMaterialsService;
 import com.gree.mall.manager.plus.service.MarketingMaterialsVisitService;
 import com.gree.mall.manager.utils.WXPushUtils;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.message.WxCpMessage;
-import me.chanjar.weixin.cp.bean.message.WxCpMessageSendResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +57,7 @@ public class DynamicMaterialsLogic {
     public IPage<DynamicMaterialsPageBean> page(HttpServletRequest request, String name, Integer pageNum, Integer pageSize) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         IPage<MarketingMaterials> page = marketingMaterialsService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(name), MarketingMaterials::getTitle, name)

src/main/java/com/gree/mall/manager/logic/marketing/MarketingMaterialsGroupLogic.java

@@ -42,7 +42,7 @@ public class MarketingMaterialsGroupLogic {
      */
     public List<MarketingMaterialsGroup> list(HttpServletRequest request, String groupName) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return marketingMaterialsGroupService.lambdaQuery()
                 .eq(StringUtils.isNotEmpty(groupName), MarketingMaterialsGroup::getGroupName, groupName)

src/main/java/com/gree/mall/manager/logic/marketing/MarketingMaterialsLogic.java

@@ -93,7 +93,7 @@ public class MarketingMaterialsLogic {
      */
     public IPage<MarketingMaterials> page(HttpServletRequest request, String title, String groupId, String type, Integer pageNum, Integer pageSize) throws IOException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return marketingMaterialsService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(title), MarketingMaterials::getTitle, title)

src/main/java/com/gree/mall/manager/logic/member/UserCouponLogic.java

@@ -3,9 +3,7 @@ package com.gree.mall.manager.logic.member;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.UserCoupon;
 import com.gree.mall.manager.plus.service.UserCouponService;
@@ -36,7 +34,7 @@ public class UserCouponLogic {
     public IPage<UserCoupon> page(HttpServletRequest request, String couponName, String couponType, Integer pageNum, Integer pageSize) {
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return userCouponService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), UserCoupon::getCompanyWechatId , companyWechatIds)

src/main/java/com/gree/mall/manager/logic/notice/MiniNoticeLogic.java

@@ -58,7 +58,7 @@ public class MiniNoticeLogic {
     public List<MiniNotice> select(HttpServletRequest request){
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
 
         List<MiniNotice> list = miniNoticeService.lambdaQuery()

src/main/java/com/gree/mall/manager/logic/notice/NoticeLogic.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
@@ -13,13 +12,11 @@ import com.gree.mall.manager.plus.service.GoodsSpecService;
 import com.gree.mall.manager.plus.service.NoticeService;
 import com.gree.mall.manager.plus.service.PromotionGroupSpecService;
 import com.gree.mall.manager.plus.service.SecKillActivitySpecService;
-import com.gree.mall.manager.utils.CommonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 public class NoticeLogic {
@@ -146,7 +143,7 @@ public class NoticeLogic {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return noticeService.lambdaQuery()
                // .in(!CollectionUtils.isEmpty(websitNoList),Notice::getWebsitNumber,websitNoList)
@@ -167,7 +164,7 @@ public class NoticeLogic {
         }*/
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return noticeService.lambdaQuery()
                 //.in(!adminWebsitBean.getType(),Notice::getWebsitNumber,websitNoList)

src/main/java/com/gree/mall/manager/logic/order/CommentTagLogic.java

@@ -42,7 +42,7 @@ public class CommentTagLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         IPage<CommentTag> page = commentTagService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),CommentTag::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),CommentTag::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .orderByDesc(CommentTag::getCreateTime)
                 .page(new Page<>(pageNo, pageSize));
         return page;

src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -1,13 +1,10 @@
 package com.gree.mall.manager.logic.order;
 
-import com.alibaba.druid.support.json.JSONUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.bean.order.*;
 import com.gree.mall.manager.commonmapper.CoustomUserCouponMapper;
 import com.gree.mall.manager.commonmapper.CustomWebsitMapper;
@@ -27,32 +24,22 @@ import com.gree.mall.manager.logic.user.UserLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.ArithUtils;
-import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.redis.util.RedisLockRegistry;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigDecimal;
-import java.math.MathContext;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -145,7 +132,7 @@ public class OrderLogic {
         }
 
         IPage page = orderInfoService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderInfo::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),OrderInfo::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 ////.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderInfo::getWebsitId,adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotEmpty(userId), OrderInfo::getUserId, userId)
                 .eq(StringUtils.isNotEmpty(goodsId),OrderInfo::getPromotionPackageGoodsId,goodsId)
@@ -212,7 +199,7 @@ public class OrderLogic {
         IPage<OrderInfo> orderInfoIPage = orderMapper.abnormalDispatchOrder(new Page<>(pageNum, pageSize), userId, orderId, productName, userName, phone,
                 exchangeCode, orderStatus, startCreateTime, endCreateTime, startPayTime,
                 endPayTime, websitId,
-                isNegative, abnormalDispatch,adminUserCom.getCompanyWechatIds(),adminUserCom.getAdminWebsitIds());
+                isNegative, abnormalDispatch,adminUserCom.getAdminCompanyIds(),adminUserCom.getAdminWebsitIds());
 
         IPage<OrderDetailBean> orderDetailBeanIPage=new Page<>();
         BeanUtils.copyProperties(orderInfoIPage,orderDetailBeanIPage);
@@ -982,7 +969,7 @@ public class OrderLogic {
         List<OrderDetailListBean> orderDetailListBeanList = orderMapper.selectByQueryMsg(userId, orderId, productName, userName,
                 phone, exchangeCode, orderStatus,
                 startCreateTime, endCreateTime,
-                startPayTime, endPayTime, promotionGroupUserName, promotionGroupId, promotionGroupUserId, websitId, goodsId, adminUser.getCompanyWechatIds(), null);
+                startPayTime, endPayTime, promotionGroupUserName, promotionGroupId, promotionGroupUserId, websitId, goodsId, adminUser.getAdminCompanyIds(), null);
 
         List<List<Object>> rows = new ArrayList<>();
         for (OrderDetailListBean orderDetailListBean : orderDetailListBeanList) {

src/main/java/com/gree/mall/manager/logic/order/OrderRefundLogic.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
-import com.gree.mall.manager.bean.order.OrderDetailBean;
 import com.gree.mall.manager.bean.order.OrderDetailListBean;
 import com.gree.mall.manager.bean.order.OrderRefundDetailBean;
 import com.gree.mall.manager.bean.order.WorkerOrderInfo;
@@ -23,9 +21,7 @@ import com.gree.mall.manager.logic.coupon.CouponLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.ArithUtils;
-import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.DateUtils;
-import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -87,7 +83,7 @@ public class OrderRefundLogic {
 
         IPage page = orderRefundService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(orderId), OrderRefund::getOrderId, orderId)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderRefund::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),OrderRefund::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 ////.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderRefund::getWebsitId,adminUser.getAdminWebsitIds())
                 .like(StringUtils.isNotEmpty(orderRefundId), OrderRefund::getOrderRefundId, orderRefundId)
                 .like(StringUtils.isNotEmpty(userName), OrderRefund::getUserName, userName)
@@ -339,7 +335,7 @@ public class OrderRefundLogic {
         excelData.setRows(rowList);
 
         List<OrderDetailListBean> orderRefundDetailList = orderRefundInfoMapper.getOrderRefundDetailList(
-                orderId, orderRefundId, userName, phone, orderStatus, startCreateTime, endCreateTime, startExamineTime, endExamineTime,adminUser.getCompanyWechatIds(),adminUser.getAdminWebsitIds());
+                orderId, orderRefundId, userName, phone, orderStatus, startCreateTime, endCreateTime, startExamineTime, endExamineTime,adminUser.getAdminCompanyIds(),adminUser.getAdminWebsitIds());
 
         for (OrderDetailListBean orderDetailListBean:orderRefundDetailList) {
             List<Object> row=new ArrayList<>();

src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -8,10 +8,7 @@ import com.github.binarywang.wxpay.bean.profitsharing.ProfitSharingQueryResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
-import com.gree.mall.manager.bean.order.OrderDetailBean;
 import com.gree.mall.manager.bean.order.OrderShareReportBean;
-import com.gree.mall.manager.commonmapper.CustomWebsitMapper;
 import com.gree.mall.manager.commonmapper.OrderShareReportMapper;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.*;
@@ -20,20 +17,18 @@ import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.WechatLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
-import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.DateUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.rmi.RemoteException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -41,31 +36,31 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class OrderShareLogic {
 
-    @Autowired
-    private WechatLogic wechatLogic;
-    @Autowired
-    CommonLogic commonLogic;
-    @Autowired
-    OrderShareService orderShareService;
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private OrderShareReportMapper orderShareReportMapper;
-    @Autowired
-    private OrderInfoService orderInfoService;
-    @Autowired
-    private OrderRefundService orderRefundService;
+    private final WechatLogic wechatLogic;
+
+    private final CommonLogic commonLogic;
+ 
+    private final OrderShareService orderShareService;
+
+    private final UserService userService;
+
+    private final OrderShareReportMapper orderShareReportMapper;
+
+    private final OrderInfoService orderInfoService;
+
+    private final OrderRefundService orderRefundService;
 
 
     public IPage<OrderShare> list(HttpServletRequest request,String userId, String websitId, String orderShareId, String orderId, String workUserName, String phone, String status,
                                   String startTime, String endTime, String startSettleTime, String endSettleTime, String position,
                                   String startPayTime,String endPayTime, String payType, Integer pageNo, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        log.info("结算管理:companyWechatId:{},adminWebsitIds:{}",JSONObject.toJSONString(adminUser.getCompanyWechatIds()),JSONObject.toJSONString(adminUser.getAdminWebsitIds()));
+        log.info("结算管理:companyWechatId:{},adminWebsitIds:{}",JSONObject.toJSONString(adminUser.getAdminCompanyIds()),JSONObject.toJSONString(adminUser.getAdminWebsitIds()));
         IPage<OrderShare> page = orderShareService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderShare::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),OrderShare::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 ////.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderShare::getWebsitId,adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotEmpty(userId), OrderShare::getUserId, userId)
                 .like(StringUtils.isNotEmpty(orderShareId), OrderShare::getOrderShareId, orderShareId)

src/main/java/com/gree/mall/manager/logic/order/OrderTaxLogic.java

@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.rmi.RemoteException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -97,7 +96,7 @@ public class OrderTaxLogic {
 
         IPage page = orderTaxService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(orderId),OrderTax::getOrderId,orderId)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),OrderTax::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),OrderTax::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 ////.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),OrderTax::getWebsitId,adminUser.getAdminWebsitIds())
                 .eq(status != null, OrderTax::getStatus, status)
                 .orderByDesc(OrderTax::getCreateTime).page(new Page(pageNum, pageSize));
@@ -132,7 +131,7 @@ public class OrderTaxLogic {
     public void exportOrderTax(Boolean status, String orderId, HttpServletRequest request, HttpServletResponse response) throws Exception {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
         List<String> adminWebsitIds = adminUser.getAdminWebsitIds();
 
         SimpleDateFormat simpleDateFormat=new SimpleDateFormat();

src/main/java/com/gree/mall/manager/logic/report/OfflineDataLogic.java

@@ -4,31 +4,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.enums.OfflineSaleRecordSaleTypeEnum;
-import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.AdminUserZone;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.OfflineSaleRecord;
-import com.gree.mall.manager.plus.entity.OrderInfo;
-import com.gree.mall.manager.plus.service.AdminUserZoneService;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.OfflineSaleRecordService;
-import com.gree.mall.manager.plus.service.WebsitZoneService;
-import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.DateUtils;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -63,7 +50,7 @@ public class OfflineDataLogic {
         }
 */
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
                 //.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
 //                .in(AdminWebsit::getCorpId, adminUser.getCorpIds())

src/main/java/com/gree/mall/manager/logic/report/SalesReportLogic.java

@@ -50,7 +50,7 @@ public class SalesReportLogic {
             return null;
         } else {
             //拥有的网点权限
-            List<AdminWebsit> list = adminWebsitService.lambdaQuery().in(AdminWebsit::getId, adminWebsitIds).list();
+            List<AdminWebsit> list = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, adminWebsitIds).list();
             List<String> websitNumbers = list.stream().map(AdminWebsit::getWebsitNumber).collect(Collectors.toList());
             //网点帐号
 //            List<SaleReport> saleReports = customSalesReportMapper.queryData(websitNumbers,startTime, endTime,adminUser.getCorpIds());

src/main/java/com/gree/mall/manager/logic/sop/SopRuleLogic.java

@@ -4,7 +4,6 @@ package com.gree.mall.manager.logic.sop;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSON;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,8 +28,6 @@ import com.gree.mall.manager.utils.StringUtil;
 import cn.hutool.core.util.XmlUtil;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.service.WxService;
-import me.chanjar.weixin.cp.bean.WxCpUser;
 import me.chanjar.weixin.cp.bean.external.contact.FollowedUser;
 import me.chanjar.weixin.cp.bean.external.contact.WxCpExternalContactInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,7 +95,7 @@ public class SopRuleLogic {
 
     public IPage<SopRuleData> list(String ruleName, Integer status, HttpServletRequest request, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<SopRuleData> list = sopRuleTaskMapper.list(new Page(pageNum, pageSize), ruleName, status, adminUser.getCompanyWechatIds(), null);
+        IPage<SopRuleData> list = sopRuleTaskMapper.list(new Page(pageNum, pageSize), ruleName, status, adminUser.getAdminCompanyIds(), null);
         List<SopRuleData> records = list.getRecords();
         for (SopRuleData record : records) {
             List<SopPushTaskData> sopPushTask = sopRuleTaskMapper.getTaskPush(record.getId());
@@ -248,7 +245,7 @@ public class SopRuleLogic {
     public IPage<SopWorkerPush> taskList(String taskId, String ruleId, String externalName, String startTime, String endTime, Integer workerStatus, HttpServletRequest request, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         return sopWorkerPushService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), SopWorkerPush::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminCompanyIds()), SopWorkerPush::getCompanyWechatId, adminUser.getAdminCompanyIds())
                 .eq(SopWorkerPush::getTaskId, taskId)
                 .eq(SopWorkerPush::getRuleId, ruleId)
                 .eq(!StringUtil.isEmpty(externalName), SopWorkerPush::getExternalName, externalName)

src/main/java/com/gree/mall/manager/logic/tag/DepartmentSyncLogic.java

@@ -12,8 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
 import me.chanjar.weixin.cp.bean.WxCpUser;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayInfo;
-import me.chanjar.weixin.cp.bean.external.WxCpContactWayResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,7 +91,7 @@ public class DepartmentSyncLogic {
 
             List<WxCpDepart> wxCpDeparts = workWechatLogic.miniApp(adminCompanyWechat).getDepartmentService().list(null);
             if (wxCpDeparts != null && wxCpDeparts.size() > 0) {
-                List<AdminWebsit> currDeparts = adminWebsitService.lambdaQuery().select(AdminWebsit::getId).list();
+                List<AdminWebsit> currDeparts = adminWebsitService.lambdaQuery().select(AdminWebsit::getWebsitId).list();
                 List<String> currDepartIds = currDeparts.stream().map(AdminWebsit::getWebsitId).collect(Collectors.toList());
 
                 List<AdminWebsit> adminWebsits = new ArrayList<>();

src/main/java/com/gree/mall/manager/logic/tag/TagGroupLogic.java

@@ -1,9 +1,6 @@
 package com.gree.mall.manager.logic.tag;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.tag.CustomTagGroup;
 import com.gree.mall.manager.bean.tag.TagGroupBean;
@@ -14,12 +11,9 @@ import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.WorkWechatLogic;
 import com.gree.mall.manager.plus.entity.Tag;
 import com.gree.mall.manager.plus.entity.TagGroup;
-import com.gree.mall.manager.plus.entity.UserTag;
 import com.gree.mall.manager.plus.service.TagGroupService;
 import com.gree.mall.manager.plus.service.TagService;
-import com.gree.mall.manager.plus.service.UserTagService;
 import com.gree.mall.manager.utils.CommonUtils;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
@@ -28,11 +22,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
-import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -61,8 +52,8 @@ public class TagGroupLogic {
             companyWechatIds.add(Constant.GD_COMPANY_WECHAT_ID);
         }else {
             AdminUserCom adminUser = commonLogic.getAdminUser(request);
-            if(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds())) {
-                companyWechatIds.addAll(adminUser.getCompanyWechatIds());
+            if(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds())) {
+                companyWechatIds.addAll(adminUser.getAdminCompanyIds());
             }
         }
         return tagGroupMapper.queryTagList(companyWechatIds);

src/main/java/com/gree/mall/manager/logic/tag/TagLogic.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.WorkWechatLogic;
@@ -15,23 +14,14 @@ import com.gree.mall.manager.plus.service.TagGroupService;
 import com.gree.mall.manager.plus.service.TagService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.external.WxCpUserExternalTagGroupList;
-import me.chanjar.weixin.cp.bean.message.WxCpMessage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.redis.util.RedisLockRegistry;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.stream.Collectors;
 
 @Service
 public class TagLogic {
@@ -53,7 +43,7 @@ public class TagLogic {
      */
     public IPage<Tag> list(HttpServletRequest request, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return tagService.lambdaQuery()
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), Tag::getCompanyWechatId, companyWechatIds)

src/main/java/com/gree/mall/manager/logic/template/TemplateLogic.java

@@ -1,6 +1,5 @@
 package com.gree.mall.manager.logic.template;
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,7 +17,6 @@ import com.gree.mall.manager.plus.service.CommonTemplateService;
 import com.gree.mall.manager.plus.service.GoodsTemplateService;
 import com.gree.mall.manager.plus.service.PubTemplateService;
 import com.gree.mall.manager.utils.DateUtils;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -57,7 +55,7 @@ public class TemplateLogic {
         }
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return commonTemplateService.lambdaQuery()
                 .orderByAsc(CommonTemplate::getCommonTemplateId)
@@ -138,7 +136,7 @@ public class TemplateLogic {
         }
 
         return pubTemplateService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PubTemplate::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PubTemplate::getCompanyWechatId,adminUser.getAdminCompanyIds())
                 .one();
     }
 

src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -10,10 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.bean.member.MemberBean;
 import com.gree.mall.manager.bean.member.MemberSortBean;
-import com.gree.mall.manager.bean.order.OrderShareReportBean;
 import com.gree.mall.manager.bean.user.UserApplyBean;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.bean.user.UserWxCustomerBean;
@@ -21,8 +19,6 @@ import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
 import com.gree.mall.manager.commonmapper.CustomMemberMapper;
 import com.gree.mall.manager.commonmapper.CustomWebsitMapper;
 import com.gree.mall.manager.commonmapper.WxCustomerMapper;
-import com.gree.mall.manager.enums.OrderShareStatusEnum;
-import com.gree.mall.manager.enums.OrderStatusEnum;
 import com.gree.mall.manager.enums.UserTypeEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.activity.PromotionGroupLogic;
@@ -53,7 +49,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.rmi.RemoteException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -121,7 +116,7 @@ public class UserLogic {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         LambdaQueryWrapper<User> memberLambdaQueryWrapper = new LambdaQueryWrapper<>();
         memberLambdaQueryWrapper
@@ -181,7 +176,7 @@ public class UserLogic {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         List<MemberBean> userList = customMemberMapper.queryUser(type, keyword, null, startTime, endTime, companyWechatIds);
 
@@ -653,7 +648,7 @@ public class UserLogic {
     public IPage<UserApplyBean> applyPage(HttpServletRequest request, String keyword, String status, Integer pageNum, Integer pageSize) {
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
         IPage<UserApplyBean> page = wxCustomerMapper.queryServiceApplyList(new Page<>(pageNum, pageSize), companyWechatIds, keyword, status);
         return page;
     }

src/main/java/com/gree/mall/manager/utils/CommonUtils.java

@@ -5,9 +5,10 @@ import com.gree.mall.manager.bean.admin.AdminWebsitBean;
 import com.gree.mall.manager.commonmapper.WebsitMapper;
 import com.gree.mall.manager.plus.entity.AdminUser;
 import com.gree.mall.manager.plus.service.AdminUserService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.boot.SpringApplication;
-import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17,78 +18,52 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.function.Predicate;
 
 public class CommonUtils {
 
 
-
-
-    public static List<String> initList(List<String> list,int size){
+    public static List<String> initList(List<String> list, int size) {
         int listSize = list.size();
-        if(listSize < size){
-            for(int i = listSize;i < size;i++){
+        if (listSize < size) {
+            for (int i = listSize; i < size; i++) {
                 list.add("");
             }
         }
         return list;
     }
 
-    public static String getStatusNameOfStudentExam(int status){
-        if(status == 1){
-            return "未完成";
-        }else if(status == 2){
-            return "已完成";
-        }else if(status == 0){
-            return "作废";
-        }
-        return "";
-    }
-
-    //(1.未考试 2.已及格,3.未及格)
-    public static String getExamStatusNameOfStudentExam(int examStatus){
-        if(examStatus == 1){
-            return "未考试";
-        }else if(examStatus == 2){
-            return "已及格";
-        }else{
-            return "未及格";
-        }
-    }
-
-    public static String getSourceName(int source){
-        if(source == 1){
-            return "后台新增";
-        }else{
-            return "线上报名";
+    public static List<Object> initList2(List<Object> list, int size) {
+        int listSize = list.size();
+        if (listSize < size) {
+            for (int i = listSize; i < size; i++) {
+                list.add("");
+            }
         }
+        return list;
     }
 
-    public static Boolean checkNotEmpty(Object... str){
-        for(Object s : str){
-            if(s instanceof String) {
-                String value = (String)s;
+    public static Boolean checkNotEmpty(Object... str) {
+        for (Object s : str) {
+            if (s instanceof String) {
+                String value = (String) s;
                 if (StringUtils.isEmpty(value)) {
                     return false;
                 }
-            }else if(s == null) {
+            } else if (s == null) {
                 return false;
             }
         }
         return true;
     }
 
-    public static Boolean checkDate(String dateStr,String dateFormat){
-        if(StringUtils.isEmpty(dateStr)){
+    public static Boolean checkDate(String dateStr, String dateFormat) {
+        if (StringUtils.isEmpty(dateStr)) {
             return true;
         }
         SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-        try{
+        try {
             sdf.parse(dateStr);
-        }catch(Exception e){
+        } catch (Exception e) {
             return false;
         }
         return true;
@@ -103,68 +78,82 @@ public class CommonUtils {
     }
 
 
-    public static String getUserId(HttpServletRequest request){
+    public static String getUserId(HttpServletRequest request) {
         String token = getToken(request);
         if (StringUtils.isEmpty(token)) {
             token = request.getParameter("token");
         }
-        if(StringUtils.isEmpty(token)){
+        if (StringUtils.isEmpty(token)) {
             return null;
         }
         try {
             String userId = JwtUtils.validateJWT(token).getClaims().getId();
             return userId;
-        }catch(Exception e){
+        } catch (Exception e) {
             return null;
         }
     }
 
-    public static String getUsername(HttpServletRequest request){
+    public static String getUsername(HttpServletRequest request) {
         String token = getToken(request);
-        if(StringUtils.isEmpty(token)){
-            return null;
+        if (StringUtils.isBlank(token)) {
+            return "";
+        }
+        try {
+            return JwtUtils.validateJWT(token).getClaims().get("username").toString();
+        } catch (Exception e) {
+            return "";
         }
-        return  JwtUtils.validateJWT(token).getClaims().get("username").toString();
+    }
+
+    public static String getUsername() {
+        HttpServletRequest request = RequestContextHolder.getRequestAttributes() != null ? ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest() : null;
+        return getUsername(request);
     }
 
 
-    public static AdminWebsitBean getAdminUser(HttpServletRequest request){
+    public static AdminWebsitBean getAdminUser(HttpServletRequest request) {
         try {
             String userId = getUserId(request);
             AdminUserService adminUserService = ApplicationContextUtils.getBean(AdminUserService.class);
             AdminUser adminUser = adminUserService.lambdaQuery()
-                    .eq(AdminUser::getAdminUserId,userId)
+                    .eq(AdminUser::getAdminUserId, userId)
                     .one();
-            if(adminUser == null){
+            if (adminUser == null) {
                 return null;
             }
             WebsitMapper websitMapper = ApplicationContextUtils.getBean(WebsitMapper.class);
             AdminWebsitBean adminWebsitBean = new AdminWebsitBean();
-            BeanUtils.copyProperties(adminUser,adminWebsitBean);
+            BeanUtils.copyProperties(adminUser, adminWebsitBean);
             adminWebsitBean.setWeidsitIds(websitMapper.queryWebsitIds(adminWebsitBean.getAdminUserId()));
             return adminWebsitBean;
-        }catch(Exception e){
+        } catch (Exception e) {
             AdminWebsitBean adminWebsitBean = new AdminWebsitBean();
             adminWebsitBean.setType(1);
             return adminWebsitBean;
         }
     }
 
-    public static String getNickName(HttpServletRequest request){
-        try{
+    public static String getNickName(HttpServletRequest request) {
+        try {
             String token = getToken(request);
-            if(StringUtils.isEmpty(token))
+            if (StringUtils.isEmpty(token))
                 return null;
             return JwtUtils.validateJWT(token).getClaims().getSubject();
-        }catch(Exception e){
+        } catch (Exception e) {
             return "";
         }
     }
 
+    public static String getNickName() {
+        HttpServletRequest request = RequestContextHolder.getRequestAttributes() != null ? ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest() : null;
+        return getNickName(request);
+    }
+
     /**
      * 获取token
      */
-    public static String getToken(HttpServletRequest request){
+    public static String getToken(HttpServletRequest request) {
         String token = request.getHeader("x-token");
         if (StringUtils.isEmpty(token)) {
             token = request.getParameter("token");
@@ -174,13 +163,14 @@ public class CommonUtils {
 
     /**
      * 获取性别code
+     *
      * @param gender
      * @return
      */
-    public static String getGenderCode(String gender){
-        if(org.apache.commons.lang3.StringUtils.equals(gender,"男")){
+    public static String getGenderCode(String gender) {
+        if (org.apache.commons.lang3.StringUtils.equals(gender, "男")) {
             return "1";
-        }else if(org.apache.commons.lang3.StringUtils.equals(gender,"女")){
+        } else if (org.apache.commons.lang3.StringUtils.equals(gender, "女")) {
             return "2";
         }
         //未知
@@ -189,7 +179,7 @@ public class CommonUtils {
 
 
     public static void downloadFile(String fileName, HttpServletResponse response) throws IOException {
-        InputStream inputStream  = CommonUtils.class.getResourceAsStream(fileName);
+        InputStream inputStream = CommonUtils.class.getResourceAsStream(fileName);
         response.setContentType("Content-Type:application/octet-stream");
         response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
         OutputStream outputStream = response.getOutputStream();
@@ -205,13 +195,14 @@ public class CommonUtils {
 
     /**
      * 检查下标对应的值不能为空
+     *
      * @param row
      * @param index
      * @return
      */
-    public static Integer checkRowEmpty(List<String> row, int[] index){
-        for(int i : index){
-            if(StringUtils.isEmpty(row.get(i))){
+    public static Integer checkRowEmpty(List<String> row, int[] index) {
+        for (int i : index) {
+            if (StringUtils.isEmpty(row.get(i))) {
                 return i;
             }
         }
@@ -219,10 +210,4 @@ public class CommonUtils {
     }
 
 
-
-
-
-
-
-
 }