WangHan
2025-04-02 a8ba678a3fe5a39da2c732014cebbb66e408e97c
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -13,6 +13,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.consum.base.core.utils.IdUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.ObjectUtils;
@@ -65,17 +66,12 @@
import com.walker.infrastructure.utils.PhoneNumberUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
 * @Description 系统用户
 * @Author wh
 * @Date 2023/7/17 14:16
 */
@Api(value = "机构用户信息", tags = "机构用户信息")
@RestController
@RequestMapping("/pc/fin/sys/tenant/user")
@Slf4j
@@ -134,9 +130,8 @@
        return ResponseValue.success(pager);
    }
    @ApiOperation(value = "根据机构id查询用户", notes = "根据机构id查询用户")
    @ApiImplicitParam(name = "tenantId", value = "机构id", required = true, dataType = "Long", paramType = "query")
    @GetMapping("/query/user")
    // @ApiOperation(value = "根据机构id查询用户", notes = "根据机构id查询用户")
   @GetMapping("/query/user")
    public ResponseValue queryUserByTenantId(Long tenantId) {
        FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
@@ -438,14 +433,14 @@
    private void buildTenantUser(FinSysTenantUser tenantUser, FinSysTenantUser sysInfo) {
        tenantUser.setId(NumberGenerator.getLongSequenceNumber());
        tenantUser.setId(IdUtil.generateId());
        tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
        tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
        // 是否删除 0是 1否
        tenantUser.setIsDelete(0);
        tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
        tenantUser.setSysUserId(IdUtil.generateId());
        setUserPhone(tenantUser, tenantUser.getUserPhone());
        String tenantId = tenantUser.getTenantId();
        FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
@@ -577,14 +572,14 @@
                                roles.stream().filter(role -> role.getRole_name().equals(data.getRoleName())).findFirst();
                        user.setRoleList(Arrays.asList(sRole.orElse(new S_role()).getRole_id()));
                        user.setId(NumberGenerator.getLongSequenceNumber());
                        user.setId(IdUtil.generateId());
                        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
                        user.setCreateBy(currentUser.getUser_name());
                        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
                        user.setUpdateBy(currentUser.getUser_name());
                        user.setStatus(1);// 0禁用 1启用
                        user.setIsDelete(0);// 是否删除 0是 1否
                        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
                        user.setSysUserId(IdUtil.generateId());
                        user.setRemark("批量导入");
                        // 加密手机号
                        setUserPhone(user, data.getUserPhone());
@@ -1066,9 +1061,7 @@
        return ResponseValue.success(1);
    }
    @ApiOperation(value = "根据机构id查询部门中的用户", notes = "根据机构id查询部门中的用户")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")})
    // @ApiOperation(value = "根据机构id查询部门中的用户", notes = "根据机构id查询部门中的用户")
    @GetMapping("/select/department")
    public ResponseValue selectDepartment(Long agencyId, String isFilter) {
        FinSysTenantVO finSysTenantVO = new FinSysTenantVO();