Merge remote-tracking branch 'origin/master'

value

2024-06-04 9a869e800b235636097abebadb1bd1cae4206cbc

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -62,20 +62,25 @@
        map.put("head", PrintChina.printChina(UserPageDto.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
        if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
        if(user.getRoleId()>10000){
            if(user.getRoleId()!=10001){
                List<Integer> ids = roleMapper.getRoleByDepart(user.getRoleId());
                user.setRoleId(null);
                map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id",ids)));
                return map;
            }else{
                user.setRoleId(null);
                map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
                return map;
        try{
            if(user.getRoleId()>10000){
                if(user.getRoleId()!=10001){
                    List<Integer> ids = roleMapper.getRoleByDepart(user.getRoleId());
                    user.setRoleId(null);
                    map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id",ids)));
                    return map;
                }else{
                    user.setRoleId(null);
                    map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
                    return map;
                }
            }
            map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
            return map;
        }catch (NullPointerException e){
            map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
            return map;
        }
        map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
        return map;
    }

    @Override
@@ -154,6 +159,7 @@
                user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
                user.setAddress("未填写");
                user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
                user.setCompanyId(person.getCompanyId());
                userMapper.insert(user);
            } else {
                user.setName(person.getName());
@@ -165,6 +171,7 @@
                user.setCreateTime(null);
                user.setUpdateUser(null);
                user.setUpdateTime(null);
                user.setCompanyId(person.getCompanyId());
                userMapper.updateById(user);
            }
        });