--部门物品分发

futian.liu

2023-11-24 7261ee93908d61a2c714645f19501aee9a7aba7b

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

@@ -6,6 +6,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.response.DepartmentVO;
@@ -46,6 +47,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -985,14 +987,18 @@
            departmentVO.setId(id);
            departmentVO.setName(department.getName());
            departmentVO.setType("department");
            FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
            finSysTenantUser.setSysDeptId(id);
            List<FinSysTenantUser> tenantUserList = finSysTenantUserService.select(finSysTenantUser);

            String sql = "SELECT SYS_USER_ID,USER_NAME FROM "
                + "fin_sys_tenant_user "
                + "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
            Map<String, Object> param = new HashMap<>();
            param.put("deptId", id);
            List<Map<String, Object>> select = finSysTenantUserService.select(sql, param, new MapperUtil());
            List<UserVO> userVOList = Lists.newArrayList();
            tenantUserList.forEach(user -> {
            select.forEach(user -> {
                UserVO userVO = new UserVO();
                userVO.setId(user.getId());
                userVO.setName(user.getUserName());
                userVO.setId((Long) user.get("sysUserId"));
                userVO.setName(user.get("userName").toString());
                userVO.setType("user");
                userVOList.add(userVO);
            });