账户权限管理

src/main/java/com/kiisoo/ic/domain/service/PrivilageDomainService.java

@@ -40,6 +40,13 @@ public interface PrivilageDomainService extends IService<PrivilageDomainDO> {
      */
     void saveAllDate(Long userId, long roleId);
 
+    /**
+     * 保存运营人员绑定零售公司数据
+     * @param userId
+     * @param companyId
+     */
+    void saveRoleY(Long userId,Long companyId);
+
     /**
      * 数据权限-维护单店权限
      * @param staffCode

src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java

@@ -1,7 +1,9 @@
 package com.kiisoo.ic.domain.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.common.DataConstants;
+import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.domain.entity.PrivilageDomainDO;
 import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO;
 import com.kiisoo.ic.domain.entity.PrivilageUserDomainDO;
@@ -10,6 +12,8 @@ import com.kiisoo.ic.domain.mapper.PrivilageDomainDOMapper;
 import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper;
 import com.kiisoo.ic.domain.mapper.PrivilageUserDomainDOMapper;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
+import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
+import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper;
 import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
 import com.kiisoo.ic.system.entity.PrivilageRoleDO;
 import com.kiisoo.ic.system.enums.RoleEnum;
@@ -46,6 +50,8 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
      */
     @Autowired
     private PrivilageUserDomainDOMapper privilageUserDomainDOMapper;
+    @Autowired
+    private OrganizationalMemberMapper organizationalMemberMapper;
 
     /**
      * 域实体 mapper
@@ -149,6 +155,27 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
         privilageUserDomainDOMapper.insert(privilageUserDomainDO);
     }
 
+    @Override
+    public void saveRoleY(Long userId, Long companyId){
+        QueryWrapper<PrivilageOrganizationalMember> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id",userId);
+        PrivilageOrganizationalMember privilageOrganizationalMember = organizationalMemberMapper.selectOne(wrapper);
+        PrivilageOrganizationalMember privilageOrganizationalMember1 = new PrivilageOrganizationalMember();
+        privilageOrganizationalMember1.setOrgId(companyId);
+        privilageOrganizationalMember1.setUserId(userId);
+        privilageOrganizationalMember1.setCreateTime(new Date());
+        privilageOrganizationalMember1.setUpdateTime(new Date());
+        privilageOrganizationalMember1.setCreateBy(Constants.SYS_OPERATION);
+        privilageOrganizationalMember1.setUpdateBy(Constants.SYS_OPERATION);
+
+        if(privilageOrganizationalMember == null){
+            organizationalMemberMapper.insert(privilageOrganizationalMember1);
+        }else {
+            privilageOrganizationalMember1.setId(privilageOrganizationalMember.getId());
+            organizationalMemberMapper.updateById(privilageOrganizationalMember1);
+        }
+    }
+
     @Override
     public void saveOneShop(long userId,String staffCode, long shopId,Long type) {
         privilageUserService.saveUserShopRelation(userId,staffCode,shopId,type);

src/main/java/com/kiisoo/ic/system/bean/AccountBean.java

@@ -73,5 +73,8 @@ public class AccountBean {
      */
     private String roleCode;
 
-
+    /**
+     * 零售公司id
+     */
+    private Long orgId;
 }

src/main/java/com/kiisoo/ic/system/bean/ModifyAccountInput.java

@@ -60,4 +60,9 @@ public class ModifyAccountInput {
      * 人员编号
      */
     private String staffCode;
+
+    /**
+     * 零售公司id
+     */
+    private Long companyId;
 }

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.common.utils.MD5FileUtil;
 import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
+import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
+import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper;
+import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
@@ -41,6 +44,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 
@@ -85,8 +89,15 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
 
     private final PoiStoreStaffDOMapper poiStoreStaffDOMapper;
 
+
     private final PoiStoreDOMapper poiStoreDOMapper;
 
+    @Autowired
+    private OrganizationalMemberMapper organizationalMemberMapper;
+
+    @Autowired
+    private RetailCompanyService retailCompanyService;
+
     @Autowired
     public PrivilageAccountServiceImpl(PrivilageAccountDOMapper privilageAccountDOMapper, PrivilageUserDOMapper privilageUserDOMapper, PrivilageUserService privilageUserService, PrivilageUserRoleService privilageUserRoleService, PrivilageDomainService privilageDomainService, PrivilageRoleDOMapper privilageRoleDOMapper, PoiStoreStaffDOMapper poiStoreStaffDOMapper, PoiStoreDOMapper poiStoreDOMapper) {
         this.privilageAccountDOMapper = privilageAccountDOMapper;
@@ -150,7 +161,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectById(saveAccountInput.getRoleId());
         //运营人员维护全店铺域实体关系
         if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
-            privilageDomainService.saveAllDate(userId, privilageRoleDO.getId());
+            privilageDomainService.saveRoleY(userId, saveAccountInput.getCompanyId());
         }
         return true;
     }
@@ -244,7 +255,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         }
         //运营人员维护全店铺域实体关系
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
-            privilageDomainService.saveAllDate(userId, privilageRoleDO.getId());
+            privilageDomainService.saveRoleY(userId, modifyAccountInput.getCompanyId());
         }
 
         return AccountEnum.ACCOUNT_MODIFY_STATUS_SUCCEED.getType();
@@ -269,10 +280,22 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
             if (accountBean == null) return;
             String roleCode = accountBean.getRoleCode();
             //不是店长设置为全部
-            if (!roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) {
+            if (!roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
                 accountBean.setChannel(AccountBean.ALL_SHOP);
                 accountBean.setShopName(AccountBean.ALL_SHOP);
             }
+            //运营人员
+            if(roleCode.equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())){
+                QueryWrapper<PrivilageOrganizationalMember> wrapper = new QueryWrapper<>();
+                wrapper.eq("user_id",userId).last("limit 1");
+                PrivilageOrganizationalMember p1 = organizationalMemberMapper.selectOne(wrapper);
+                if(p1 != null){
+                    accountBean.setOrgId(p1.getOrgId());
+                    List<PoiStore> list1 = retailCompanyService.selectShopByCompany(p1.getOrgId());
+                    List<String> str = list1.stream().map(PoiStore::getName).collect(toList());
+                    accountBean.setShopName(str.toString().replace("[","").replace("]",""));
+                }
+            }
             //店长角色查询店铺信息和渠道
             if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) || roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) {
                 QueryWrapper<PoiStoreStaff> wrapper = new QueryWrapper<>();