cy
2023-12-08 c38a400aba3221fdff0bb576d177c1a6a590ecb7
feat: 设置库管员
3个文件已修改
60 ■■■■■ 已修改文件
admin-web/src/views/foundation/store/person.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/foundation/store/person.vue
@@ -35,7 +35,7 @@
</template>
<script>
import {userSelectDepartment, warehouseManagerList} from '@/api/foudation/store';
import {userSelectDepartment, warehouseManagerList, warehouseManagerAdd} from '@/api/foudation/store';
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
@@ -141,16 +141,21 @@
          managerName: item.name,
        });
      });
      setTimeout(()=>{
        this.$message.success('保存成功!');
        this.close();
        this.$emit('search');
      },6000)
      // warehouseManagerAdd(params).then((res) => {
      // setTimeout(()=>{
      //   warehouseManagerAdd(params).then((res) => {
      //     this.$message.success('保存成功!');
      //     this.close();
      //     this.$emit('search');
      //   });
      //   this.$message.success('保存成功!');
      //   this.close();
      //   this.$emit('search');
      // });
      // },6000)
      warehouseManagerAdd(params).then((res) => {
        this.$message.success('保存成功!');
        this.close();
        this.$emit('search');
      });
    },
  },
};
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
@@ -1,12 +1,5 @@
package com.consum.base.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.util.PlatformRSAUtils;
@@ -16,6 +9,12 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class FinSysTenantUserServiceImpl extends BaseServiceImpl {
@@ -128,6 +127,15 @@
        }
        return null;
    }
    public  FinSysTenantUser queryOneBySysId(String sysUserId) {
        FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
        finSysTenantUser.setSysUserId(Long.valueOf(sysUserId));
        List<FinSysTenantUser> finSysTenantUserList = this.select(finSysTenantUser);
        if (!StringUtils.isEmptyList(finSysTenantUserList)) {
            return finSysTenantUserList.get(0);
        }
        return null;
    }
    public FinSysTenantUser queryOneByUserId(String userId) {
        List<FinSysTenantUser> finSysTenantUserList =
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -10,12 +10,13 @@
import com.iplatform.model.po.S_role;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Description 物品分类
@@ -85,11 +86,17 @@
                baseWarehouseManager.setManagerName(managerName);
                this.insert(baseWarehouseManager);
                FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneById(String.valueOf(managerId));
                FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneBySysId(String.valueOf(managerId));
                if (finSysTenantUser == null) {
                    throw new Exception("用户不存在");
                }
                Long sysUserId = finSysTenantUser.getSysUserId();
                // 先判断是否拥有该角色
                String isHasRole = "select count(1) 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;
                }
                String saveUserRole = "insert into s_role_user(user_id, role_id, org_id) values(:managerId,:roleId,0)";
                Map<String, Object> userRoleParam = new HashMap<>();
                userRoleParam.put("managerId", sysUserId);
@@ -112,7 +119,7 @@
    @Override
    public List<BaseWarehouseManager> selectManagerList(Long warehouseId, Long agencyId) {
        StringBuilder sql = new StringBuilder("select * from base_warehouse_manager bwm left join base_warehouse bw on bwm.base_warehouse_id = bw.id "
            + "where 1=1 ");
                + "where 1=1 ");
        Map<String, Object> param = new HashMap<>();
        if (warehouseId != null) {
            param.put("warehouseId", warehouseId);