修改导出为标准返回

futian.liu

2023-12-12 f470bdc535b6ca345d4e843da248f8860d294b85

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

@@ -39,7 +39,7 @@
import com.consum.base.pojo.response.FinSysTenantVO;
import com.consum.base.pojo.response.UserVO;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
@@ -82,7 +82,7 @@

    private UserServiceImpl userService;

    private FinSysTenantServiceImpl finSysTenantService;
    private FinSysTenantService finSysTenantService;

    private RoleServiceImpl roleService;

@@ -95,7 +95,7 @@
    }

    @Autowired
    public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService,
    public FinSysTenantUserController(FinSysTenantService finSysTenantService,
        FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
        this.finSysTenantUserService = finSysTenantUserService;
        this.finSysTenantService = finSysTenantService;
@@ -205,7 +205,7 @@
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue add() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);

@@ -242,34 +242,35 @@
        }
        tenantUser.setUserPhone(encPhone);
        // 怎么获取左侧机构树数据
        tenantUser.setSysDeptId(3L); // 对应平台机构id 默认为平台管理
        // tenantUser.setSysDeptId(3L); // 对应平台机构id 默认为平台管理
        this.finSysTenantUserService.insert(tenantUser);

        // 插入平台用户
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
        userCore.setId(tenantUser.getSysUserId());
        userCore.setDept_id(3L); // 部门id，目前写死
        userCore.setOrg_id(user.getSysDeptId()); // 机构id
        userCore.setOrg_id(tenantUser.getSysDeptId()); // 机构id
        userCore.setOrg_id(1L);
        userCore.setUser_name(user.getUserCode()); // 用户账号
        userCore.setNick_name(user.getUserName());
        userCore.setUser_name(tenantUser.getUserCode()); // 用户账号
        userCore.setNick_name(tenantUser.getUserName());
        // 用户类型 先默认设置为2
        userCore.setUser_type(2);
        userCore.setPhonenumber(encPhone);
        userCore.setSex(user.getSex().toString());
        userCore.setSex(tenantUser.getSex().toString());
        // 初始化密码 123456
        String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
        userCore.setPassword(pws);
        // 平台用户表和系统用户 表状态相反
        if (user.getStatus() == 0) {
            user.setStatus(1);
        if (tenantUser.getStatus() == 0) {
            tenantUser.setStatus(1);
        } else {
            user.setStatus(0);
            tenantUser.setStatus(0);
        }
        userCore.setStatus(user.getStatus());
        userCore.setStatus(tenantUser.getStatus());
        userCore.setDel_flag(0);
        userCore.setCreate_by(this.getCurrentUser().getUser_name());
        userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        userCore.setRemark(user.getRemark());
        userCore.setRemark(tenantUser.getRemark());
        userCore.setType(1);
        userCore.setBind_client_id("0");
        userCore.setBind_wechat(0);
@@ -293,7 +294,7 @@
        // 少角色id
        List<Long> roleList = user.getRoleList(); // 机构id 多个
        if (!CollectionUtils.isEmpty(roleList)) {
            Long sysUserId = user.getSysUserId(); // 用户id
            Long sysUserId = tenantUser.getSysUserId(); // 用户id
            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
        }
        // this.getFinCustomerCache().remove();
@@ -309,7 +310,7 @@
    public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file)
        throws IOException {
        String originalFilename = file.getOriginalFilename();
        if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
        if (!originalFilename.endsWith("xls")) {
            return ResponseValue.error("文件格式有误!");
        }
        S_user_core currentUser = this.getCurrentUser();
@@ -486,7 +487,7 @@
    @PostMapping("/update")
    @Transactional(rollbackFor = Exception.class)
    public ResponseValue update() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);

@@ -683,8 +684,8 @@
     */
    @PostMapping("/updRole")
    public ResponseValue updRole() {
        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
        FinSysTenantUser tenantUser = new FinSysTenantUser();
        CommonUtil.copyProperties(user, tenantUser);
        user = tenantUser;