修改库管员角色关联

futian.liu

2023-12-14 8198de5cf4f4bccf44b789b895980569307a5ceb

修改库管员角色关联

 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java

@@ -37,6 +37,7 @@
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
import com.consum.base.pojo.response.UserVO;
import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.FinSysTenantUserService;
@@ -87,16 +88,15 @@
    private FinSysTenantDepartmentService finSysTenantDepartmentService;

    @Autowired
    public void setUserService(UserServiceImpl userService) {
        this.userService = userService;
    }
    private BaseWarehouseManagerService baseWarehouseManagerService;

    @Autowired
    public FinSysTenantUserController(FinSysTenantService finSysTenantService,
        FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService) {
        FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService, UserServiceImpl userService) {
        this.finSysTenantUserService = finSysTenantUserService;
        this.finSysTenantService = finSysTenantService;
        this.roleService = roleService;
        this.userService = userService;
    }

    /**
@@ -198,13 +198,7 @@
        // 是否删除 0是 1否
        tenantUser.setIsDelete(0);
        tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
        // 加密手机号
        String key = PlatformRSAUtils.AES_KEY;
        String encPhone = "";
        if (tenantUser.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
        }
        tenantUser.setUserPhone(encPhone);
        setUserPhone(tenantUser, tenantUser.getUserPhone());
        String tenantId = tenantUser.getTenantId();
        FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
        tenantUser.setTenantCode(finSysTenant.getCode());
@@ -219,6 +213,16 @@
            tenantUser.setSysDeptId(2l);
        }

    }

    private void setUserPhone(FinSysTenantUser tenantUser, String userPhone) {
        // 加密手机号
        String key = PlatformRSAUtils.AES_KEY;
        String encPhone = "";
        if (tenantUser.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(userPhone, key);
        }
        tenantUser.setUserPhone(encPhone);
    }

    private S_user_core getsUserCore(FinSysTenantUser tenantUser) {
@@ -334,9 +338,7 @@
                user.setSysUserId(NumberGenerator.getLongSequenceNumber());
                user.setRemark("批量导入");
                // 加密手机号
                String key = PlatformRSAUtils.AES_KEY;
                String encPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
                user.setUserPhone(encPhone);
                setUserPhone(user, data.getUserPhone());

                user.setIsDelete(1);
                // 怎么获取左侧机构树数据
@@ -421,12 +423,7 @@
        if (tenantUser == null) {
            return ResponseValue.error("参数为空");
        }
        String key = PlatformRSAUtils.AES_KEY;
        String encPhone = "";
        if (tenantUser.getUserPhone() != null) {
            encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
        }
        tenantUser.setUserPhone(encPhone);
        setUserPhone(tenantUser, tenantUser.getUserPhone());
        // 1.更新系统用户 FIN_SYS_TENANT_USER
        finSysTenantUserService.update(tenantUser);
        // 2.更新平台用户 S_USER_CORE
@@ -442,8 +439,12 @@
        // 先删除再添加
        if (!CollectionUtils.isEmpty(list)) {
            finSysTenantUserService.execDelRoleUserList(sysUserId);
            // 删除库管员信息记录
            list.stream().filter(item -> "仓库管理员".equals(item.getRole_name())).findFirst()
                .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
        }
        if (!CollectionUtils.isEmpty(roleList)) {
            // 因为不知道该用户需要管理那个仓库 故不新增仓库管理员信息，只添加角色
            finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
        }
        this.getFinSysTenantUserCache().remove(sysUserId.toString());
@@ -624,7 +625,11 @@
        List<Long> roleList = user.getRoleList();
        // 先删除再添加
        if (list != null && list.size() > 0) {
            finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
            Long sysUserId = user.getSysUserId();
            finSysTenantUserService.execDelRoleUserList(sysUserId);
            // 删除库管员信息记录
            list.stream().filter(item -> "仓库管理员".equals(item.getRole_name())).findFirst()
                .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
        }
        if (roleList != null && roleList.size() > 0) {
            finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
@@ -719,12 +724,7 @@
        updUser.setEmail(userParam.getEmail());
        updUser.setUserName(userParam.getUserName());
        updUser.setSex(userParam.getSex());
        String encPhone = "";
        if (userParam.getUserPhone() != null) {
            String key = PlatformRSAUtils.AES_KEY;
            encPhone = AESUtils.encryptStrAES(userParam.getUserPhone(), key);
        }
        updUser.setUserPhone(encPhone);
        setUserPhone(updUser, userParam.getUserPhone());
        // 1.更新系统用户 FIN_SYS_TENANT_USER
        finSysTenantUserService.update(updUser);
        // 2.更新平台用户 S_USER_CORE

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java

@@ -1,10 +1,11 @@
package com.consum.base.service;

import java.util.List;
import java.util.Set;

import com.consum.base.pojo.request.WarehouseManagerParam;
import com.consum.model.po.BaseWarehouseManager;
import com.walker.jdbc.service.BaseService;
import java.util.List;
import java.util.Set;

public interface BaseWarehouseManagerService extends BaseService {

@@ -13,4 +14,6 @@
    List<BaseWarehouseManager> selectWarehouseManager(Long warehouseId);

    List<BaseWarehouseManager> selectManagerList(Long warehouseId, Long agencyId);

    void deleteMangerBySysUserId(Long sysUserId);
}

 consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java

@@ -98,8 +98,8 @@
                }
                Long sysUserId = finSysTenantUser.getSysUserId();
                // 先判断是否拥有该角色
                String isHasRole = "select * from s_role_user where org_id=0 and role_id=" + roleId
                    + " and user_id=" + sysUserId;
                String isHasRole =
                    "select * from s_role_user where org_id=0 and role_id=" + roleId + " and user_id=" + sysUserId;
                List<Map<String, Object>> isHasRoleList = this.select(isHasRole, new HashMap<>());
                if (!CollectionUtils.isEmpty(isHasRoleList)) {
                    continue;
@@ -142,4 +142,12 @@
        return select;
    }

    @Override
    public void deleteMangerBySysUserId(Long sysUserId) {
        String sql = "delete from base_warehouse_manager where MANAGER_ID =:sysUserId";
        Map<String, Object> params = new HashMap<>();
        params.put("sysUserId", sysUserId);
        this.execute(sql, params);
    }

}