资方管理提交

tianhu-system/src/main/java/com/tianhu/system/controller/OwnManagementInfController.java

@@ -0,0 +1,355 @@
+package com.tianhu.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.utils.IdUtils;
+import com.tianhu.common.core.utils.SecurityUtils;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.core.web.page.TableDataInfo;
+import com.tianhu.common.log.annotation.Log;
+import com.tianhu.common.log.enums.BusinessType;
+import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysDept;
+import com.tianhu.system.api.domain.SysRole;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.domain.SysCompany;
+import com.tianhu.system.domain.SysManagementInf;
+import com.tianhu.system.domain.SysUserCompanyRel;
+import com.tianhu.system.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 资方管理Controller
+ *
+ * @author cuixq
+ * @date 2021-08-17
+ */
+@RestController
+@RequestMapping("/fundSide")
+public class OwnManagementInfController extends BaseController
+{
+    @Autowired
+    private IOwnCompanyService companyService;
+    @Autowired
+    private IOwnManagementInfService ownManagementInfService;
+    @Autowired
+    private ISysManagementInfService sysManagementInfService;
+    @Autowired
+    private ISysUserCompanyRelService sysUserCompanyRelService;
+    @Autowired
+    private ISysCompanyService sysCompanyService;
+    @Autowired
+    private ISysDeptService deptService;
+    @Autowired
+    private ISysRoleService roleService;
+    @Autowired
+    private ISysUserService userService;
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private ISysConfigService configService;
+    /**
+     * 公司状态(正常)
+     */
+    private String staust_00 = "00";
+    /**
+     * 公司类型(资方)
+     */
+    private String type_03 = "03";
+    /**
+     * 默认父级id
+     */
+    private Long defaultId = 0L;
+    /**
+     * 默认祖级列表
+     */
+    private String defaultAn = "0";
+    /**
+     * 默认排序
+     */
+    private String defaultOrder = "1";
+    /**
+     * 数据权限1全部
+     */
+    private String dataScope = "1";
+    /**
+     * 是否关联显示
+     */
+    private boolean isCheck = true;
+    /**
+     * 默认状态0正常
+     */
+    private String status = "0";
+    /**
+     * 自动创建
+     */
+    private String isAuto = "1";
+
+
+    /**
+     * 查询资方列表
+     */
+    @PreAuthorize(hasPermi = "fundSide:fundSide:list")
+    @GetMapping("/list")
+    public TableDataInfo list(String scyName,String smiType,String smiManager,String smiContract,String smiContractPhone)
+    {
+        startPage();
+        Map map = new HashMap<>();
+        map.put("scyName",scyName);
+        map.put("smiType",smiType);
+        map.put("smiManager",smiManager);
+        map.put("smiContract",smiContract);
+        map.put("smiContractPhone",smiContractPhone);
+        List<Map> list = ownManagementInfService.selectFundSide(map);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询企业详情
+     */
+//    @PreAuthorize(hasPermi = "system:company:details")
+    @GetMapping("details/{scyId}")
+    public AjaxResult details(@PathVariable("scyId") String scyId)throws Exception {
+        LoginUser user = tokenService.getLoginUser();
+        Map map = new HashMap<>();
+        map.put("scyId",scyId);
+        List<Map> list = ownManagementInfService.selectFundSide(map);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 资方状态修改
+     * @return
+     */
+    @PreAuthorize(hasPermi = "fundSide:fundSide:edit")
+    @Log(title = "资方状态修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/fundSideStatus")
+    public R fundSideStatus(@RequestBody SysCompany company)
+    {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        //修改人
+        company.setUpdateBy(use.getUserId()+"");
+        //获取当前时间
+        Date currentTime = DateUtils.getNowDate();
+        //修改时间
+        company.setUpdateTime(currentTime);
+        sysCompanyService.updateSysCompany(company);
+        return R.ok();
+    }
+
+
+
+    /**
+     * 新增资方公司
+     */
+    @PreAuthorize(hasPermi = "fundSide:fundSide:add")
+    @Log(title = "新增资方公司", businessType = BusinessType.INSERT)
+    @Transactional(rollbackFor=Exception.class)
+    @PostMapping("/addFundSide")
+    public R addFundSide(@RequestBody Map<String,Object> map){
+        String scyName = CommonUtil.objToString(map.get("scyName"));
+        if(CommonUtil.isEmpty(scyName)){
+            return R.fail("资金方名称不可为空");
+        }
+        String smiType = CommonUtil.objToString(map.get("smiType"));
+        if(CommonUtil.isEmpty(smiType)){
+            return R.fail("资金方类型不可为空");
+        }
+        String smiAgreementType = CommonUtil.objToString(map.get("smiAgreementType"));
+        if(CommonUtil.isEmpty(smiAgreementType)){
+            return R.fail("合作协议签署不可为空");
+        }
+        String smiAddress = CommonUtil.objToString(map.get("smiAddress"));
+        if(CommonUtil.isEmpty(smiAddress)){
+            return R.fail("资金方网点不可为空");
+        }
+        String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
+        if(CommonUtil.isEmpty(scySocialCode)){
+            return R.fail("社会统一代码不可为空");
+        }
+        String smiManager = CommonUtil.objToString(map.get("smiManager"));
+        if(CommonUtil.isEmpty(smiManager)){
+            return R.fail("客户经理不可为空");
+        }
+        String smiContract = CommonUtil.objToString(map.get("smiContract"));
+        if(CommonUtil.isEmpty(smiContract)){
+            return R.fail("联系人姓名不可为空");
+        }
+        String smiContractPhone = CommonUtil.objToString(map.get("smiContractPhone"));
+        if(CommonUtil.isEmpty(smiContractPhone)){
+            return R.fail("联系人电话不可为空");
+        }
+        String smiDesc = CommonUtil.objToString(map.get("smiDesc"));
+        List<Map<String,String>> smiAgreement = (List<Map<String, String>>) map.get("smiAgreement");
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(SysCompany::getScyName,scyName);
+        List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
+       SysCompany company = new SysCompany();
+        if(list.size()>0){
+            return R.fail("公司名称已存在");
+        }
+        LoginUser userInfo = tokenService.getLoginUser();
+        String  scyId  =  IdUtils.fastSimpleUUID();
+        //创建用户
+        company.setScyId(scyId);
+        company.setScyName(scyName);
+        company.setScyStatus(staust_00);
+        company.setScyType(type_03);
+        company.setScySocialCode(scySocialCode);
+        //获取创建人
+        SysUser use = userInfo.getSysUser();
+        company.setCreateBy(use.getUserId()+"");
+        sysCompanyService.createSysCompany(company);
+        //创建部门
+        SysDept dept = new SysDept();
+        dept.setCompanyId(scyId);
+        dept.setDeptName(scyName);
+        dept.setParentId(defaultId);
+        dept.setAncestors(defaultAn);
+        dept.setOrderNum(defaultOrder);
+        dept.setCreateBy(use.getUserId()+"");
+        deptService.insertDept(dept);
+        List<SysDept> deptList= deptService.selectDeptList(dept);
+        //部门id
+        Long deptId = deptList.get(0).getDeptId();
+        //创建角色
+        SysRole sysRole = new SysRole();
+        sysRole.setCompanyId(scyId);
+        sysRole.setRoleName(scyName);
+        sysRole.setRoleSort(defaultOrder);
+        sysRole.setDataScope(dataScope);
+        sysRole.setMenuCheckStrictly(isCheck);
+        sysRole.setDeptCheckStrictly(isCheck);
+        sysRole.setStatus(status);
+        sysRole.setStatus("0");
+        sysRole.setCreateBy(use.getUserId()+"");
+        sysRole.setIsAuto("1");
+        companyService.insertRole(sysRole);
+        List<SysRole> roleList= roleService.selectRoleList(sysRole);
+        //角色id
+        Long roleId = roleList.get(0).getRoleId();
+        Long[] roleIds = new Long[1];
+        roleIds[0] = roleId;
+        //创建用户
+        SysUser sysUser = new SysUser();
+        SysUser listUser = userService.selectUserByUserName(smiContractPhone);
+        if(listUser == null){
+            sysUser.setUserName(smiContractPhone);
+            sysUser.setNickName(smiContract);
+            String password = configService.selectConfigByKey("sys.user.initPassword");
+            sysUser.setPassword(SecurityUtils.encryptPassword(password));
+            sysUser.setCreateBy(use.getUserId()+"");
+            sysUser.setRoleIds(roleIds);
+            userService.insertUser(sysUser);
+        } else {
+            listUser.setRoleIds(roleIds);
+            userService.insertUserRole(listUser);
+        }
+        SysUser listUserTwo = userService.selectUserByUserName(smiContractPhone);
+        //创建资方信息
+        SysManagementInf sysManagementInf =new SysManagementInf();
+        sysManagementInf.setSmiCompanyId(scyId);
+        sysManagementInf.setSmiType(smiType);
+        sysManagementInf.setSmiAgreementType(smiAgreementType);
+        sysManagementInf.setSmiAddress(smiAddress);
+        sysManagementInf.setSmiManager(smiManager);
+        sysManagementInf.setSmiContractId(listUserTwo.getUserId());
+        sysManagementInf.setSmiDesc(smiDesc);
+        sysManagementInfService.createSysManagementInf(sysManagementInf);
+        SysUserCompanyRel sysUserCompanyRel =new SysUserCompanyRel();
+        sysUserCompanyRel.setSucrCompanyId(scyId);
+        sysUserCompanyRel.setSucrUserId(listUserTwo.getUserId());
+        sysUserCompanyRel.setSucrDeptId(deptId);
+        sysUserCompanyRel.setSucrHandler("1");
+        sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+        return R.ok();
+    }
+
+    /**
+     * 修改资方公司
+     */
+    @PreAuthorize(hasPermi = "fundSide:fundSide:edit")
+    @Log(title = "修改资方公司", businessType = BusinessType.UPDATE)
+    @Transactional(rollbackFor=Exception.class)
+    @PostMapping("/editFundSide")
+    public R editFundSide(@RequestBody Map<String,Object> map) {
+        String scyId = CommonUtil.objToString(map.get("scyId"));
+        String scyName = CommonUtil.objToString(map.get("scyName"));
+        if(CommonUtil.isEmpty(scyName)){
+            return R.fail("资金方名称不可为空");
+        }
+        String smiType = CommonUtil.objToString(map.get("smiType"));
+        if(CommonUtil.isEmpty(smiType)){
+            return R.fail("资金方类型不可为空");
+        }
+        String smiAgreementType = CommonUtil.objToString(map.get("smiAgreementType"));
+        if(CommonUtil.isEmpty(smiAgreementType)){
+            return R.fail("合作协议签署不可为空");
+        }
+        String smiAddress = CommonUtil.objToString(map.get("smiAddress"));
+        if(CommonUtil.isEmpty(smiAddress)){
+            return R.fail("资金方网点不可为空");
+        }
+        String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
+        if(CommonUtil.isEmpty(scySocialCode)){
+            return R.fail("社会统一代码不可为空");
+        }
+        String smiManager = CommonUtil.objToString(map.get("smiManager"));
+        if(CommonUtil.isEmpty(smiManager)){
+            return R.fail("客户经理不可为空");
+        }
+        String smiContract = CommonUtil.objToString(map.get("smiContract"));
+        if(CommonUtil.isEmpty(smiContract)){
+            return R.fail("联系人姓名不可为空");
+        }
+        String smiContractPhone = CommonUtil.objToString(map.get("smiContractPhone"));
+        if(CommonUtil.isEmpty(smiContractPhone)){
+            return R.fail("联系人电话不可为空");
+        }
+        String smiDesc = CommonUtil.objToString(map.get("smiDesc"));
+        List<Map<String,String>> smiAgreement = (List<Map<String, String>>) map.get("smiAgreement");
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(SysCompany::getScyName,scyName);
+        queryWrapper.ne(SysCompany::getScyId,scyId);
+        List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
+        SysCompany company = new SysCompany();
+        company.setScyId(scyId);
+        if(list.size()>0){
+            return R.fail("公司名称已存在");
+        }
+        company.setScyName(scyName);
+        company.setScySocialCode(scySocialCode);
+        //获取修改人
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        company.setUpdateBy(use.getUserId()+"");
+        //获取当前时间
+        Date currentTime = DateUtils.getNowDate();
+        company.setUpdateTime(currentTime);
+        sysCompanyService.updateSysCompany(company);
+        //创建资方信息
+        SysManagementInf sysManagementInf =new SysManagementInf();
+        sysManagementInf.setSmiCompanyId(scyId);
+        sysManagementInf.setSmiType(smiType);
+        sysManagementInf.setSmiAgreementType(smiAgreementType);
+        sysManagementInf.setSmiAddress(smiAddress);
+        sysManagementInf.setSmiManager(smiManager);
+        sysManagementInf.setSmiDesc(smiDesc);
+        sysManagementInfService.updateSysManagementInf(sysManagementInf);
+        return R.ok();
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/controller/PayBankAccInfController.java

@@ -0,0 +1,69 @@
+package com.tianhu.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.keao.tianhu.core.entity.R;
+import com.keao.tianhu.core.exception.base.BusinessException;
+import com.keao.tianhu.starter.mybatis.plus.controller.BaseController;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.system.domain.PayBankAccInf;
+import com.tianhu.system.service.IPayBankAccInfService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * ClassName: PayBankAccInfController<br>
+ * Description: PayBankAccInf Controller <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
+ */
+@Slf4j
+@RestController
+public class PayBankAccInfController extends BaseController {
+
+    @Autowired
+    private IPayBankAccInfService payBankAccInfService;
+
+    @GetMapping("payBankAccInf")
+    public R getAllPayBankAccInfs(PayBankAccInf payBankAccInf) {
+        //TODO LambdaQueryWrapper 根据需求构建
+        LambdaQueryWrapper<PayBankAccInf> queryWrapper = new LambdaQueryWrapper();
+        return R.ok(payBankAccInfService.findPayBankAccInfs(queryWrapper));
+    }
+
+    @GetMapping("payBankAccInf/list")
+    public R payBankAccInfList(QueryRequest request, PayBankAccInf payBankAccInf) {
+        //TODO LambdaQueryWrapper 根据需求构建
+        LambdaQueryWrapper<PayBankAccInf> queryWrapper = new LambdaQueryWrapper();
+        Map<String, Object> dataTable = getDataTable(this.payBankAccInfService.findPayBankAccInfs(request, queryWrapper));
+        return R.ok(dataTable);
+    }
+
+    @PostMapping("payBankAccInf")
+    public R addPayBankAccInf(@Valid PayBankAccInf payBankAccInf) throws BusinessException {
+        this.payBankAccInfService.createPayBankAccInf(payBankAccInf);
+        return R.ok();
+    }
+
+    @GetMapping("payBankAccInf/delete")
+    public R deletePayBankAccInf(PayBankAccInf payBankAccInf) throws BusinessException {
+        //TODO LambdaQueryWrapper 根据需求构建
+        LambdaQueryWrapper<PayBankAccInf> queryWrapper = new LambdaQueryWrapper();
+        this.payBankAccInfService.deletePayBankAccInf(queryWrapper);
+        return R.ok();
+    }
+
+    @PostMapping("payBankAccInf/update")
+    public R updatePayBankAccInf(PayBankAccInf payBankAccInf) throws BusinessException {
+        this.payBankAccInfService.updatePayBankAccInf(payBankAccInf);
+        return R.ok();
+    }
+
+}

tianhu-system/src/main/java/com/tianhu/system/domain/PayBankAccInf.java

@@ -0,0 +1,101 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 关联银行卡信息表 
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pay_bank_acc_inf")
+public class PayBankAccInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId("PBAI_ID")
+    private String pbaiId;
+
+    /**
+     * 所属客户
+     */
+    @TableField("PBAI_CSTNO")
+    private String pbaiCstno;
+
+    /**
+     * 开户名
+     */
+    @TableField("PBAI_ACCOUNT_NAME")
+    private String pbaiAccountName;
+
+    /**
+     * 所属账户
+     */
+    @TableField("PBAI_ACCOUNTNO")
+    private String pbaiAccountno;
+
+    /**
+     * 银行卡号
+     */
+    @TableField("PBAI_BANKACCOUNT_ID")
+    private String pbaiBankaccountId;
+
+    /**
+     * 所属银行
+     */
+    @TableField("PBAI_BANK_NAME")
+    private String pbaiBankName;
+
+    /**
+     * 状态（0：激活；1：停用; 2:删除）
+     */
+    @TableField("PBAI_STATUS")
+    private String pbaiStatus;
+
+    /**
+     * 是否基本户(0:不是, 1:是)
+     */
+    @TableField("PBAI_BASIC")
+    private String pbaiBasic;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/domain/SysManagementFileRel.java

@@ -0,0 +1,40 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 资方协议附件表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_management_file_rel")
+public class SysManagementFileRel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("smfr_company_id")
+    private String smfrCompanyId;
+
+    /**
+     * 附件表ID(pub_file_inf.pfi_file_id)
+     */
+    @TableField("smfr_file_id")
+    private String smfrFileId;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/domain/SysManagementInf.java

@@ -0,0 +1,95 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 资方信息表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_management_inf")
+public class SysManagementInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("smi_company_id")
+    private String smiCompanyId;
+
+    /**
+     * 资金方类型
+     */
+    @TableField("smi_type")
+    private String smiType;
+
+    /**
+     * 合作协议签署
+     */
+    @TableField("smi_agreement_type")
+    private String smiAgreementType;
+
+    /**
+     * 资金方网点
+     */
+    @TableField("smi_address")
+    private String smiAddress;
+
+    /**
+     * 客户经理
+     */
+    @TableField("smi_manager")
+    private String smiManager;
+
+    /**
+     * 联系人ID(sys_user.user_id)
+     */
+    @TableField("smi_contract_id")
+    private Long smiContractId;
+
+    /**
+     * 补充描述
+     */
+    @TableField("smi_desc")
+    private String smiDesc;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/domain/SysUserCompanyRel.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author cuixq
- * @since 2021-08-17
+ * @since 2021-08-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

tianhu-system/src/main/java/com/tianhu/system/domain/SysUserRole.java

@@ -5,14 +5,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户和角色关联 sys_user_role
- * 
+ *
  * @author tianhu
  */
 public class SysUserRole
 {
     /** 用户ID */
     private Long userId;
-    
+
     /** 角色ID */
     private Long roleId;
 
@@ -39,8 +39,8 @@ public class SysUserRole
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("roleId", getRoleId())
-            .toString();
+                .append("userId", getUserId())
+                .append("roleId", getRoleId())
+                .toString();
     }
 }

tianhu-system/src/main/java/com/tianhu/system/mapper/OwnManagementInfMapper.java

@@ -0,0 +1,22 @@
+package com.tianhu.system.mapper;
+
+import com.tianhu.system.domain.SysCompany;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 公司Mapper接口
+ * 
+ * @author keao
+ * @date 2020-12-16
+ */
+public interface OwnManagementInfMapper
+{
+    /**
+     * 查询资方列表
+     * @param
+     * @return
+     */
+    List<Map> selectFundSide(Map map);
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/PayBankAccInfMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.PayBankAccInf;
+
+/**
+ * <p>
+ * 关联银行卡信息表  Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-16
+ */
+public interface PayBankAccInfMapper extends BaseMapper<PayBankAccInf> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/SysManagementFileRelMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.SysManagementFileRel;
+
+/**
+ * <p>
+ * 资方协议附件表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-18
+ */
+public interface SysManagementFileRelMapper extends BaseMapper<SysManagementFileRel> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/SysManagementInfMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.SysManagementInf;
+
+/**
+ * <p>
+ * 资方信息表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-17
+ */
+public interface SysManagementInfMapper extends BaseMapper<SysManagementInf> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IOwnManagementInfService.java

@@ -0,0 +1,23 @@
+package com.tianhu.system.service;
+
+import com.tianhu.system.api.domain.SysRole;
+import com.tianhu.system.domain.SysCompany;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 资金方Service接口
+ * 
+ * @author keao
+ * @date 2020-12-16
+ */
+public interface IOwnManagementInfService
+{
+    /**
+     * 查询资方列表
+     * @param
+     * @return
+     */
+    List<Map> selectFundSide(Map map);
+}

tianhu-system/src/main/java/com/tianhu/system/service/IPayBankAccInfService.java

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.PayBankAccInf;
+
+import java.util.List;
+
+/**
+ * ClassName: IPayBankAccInfService<br>
+ * Description: PayBankAccInfService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
+ */
+public interface IPayBankAccInfService extends IService<PayBankAccInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<PayBankAccInf>
+     * @return IPage<PayBankAccInf>
+     */
+    IPage<PayBankAccInf> findPayBankAccInfs(QueryRequest request, LambdaQueryWrapper<PayBankAccInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<PayBankAccInf>
+     * @return List<PayBankAccInf>
+     */
+    List<PayBankAccInf> findPayBankAccInfs(LambdaQueryWrapper<PayBankAccInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param payBankAccInf payBankAccInf
+     */
+    void createPayBankAccInf(PayBankAccInf payBankAccInf);
+
+    /**
+     * 修改
+     *
+     * @param payBankAccInf payBankAccInf
+     */
+    void updatePayBankAccInf(PayBankAccInf payBankAccInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<PayBankAccInf>
+     */
+    void deletePayBankAccInf(LambdaQueryWrapper<PayBankAccInf> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/ISysManagementFileRelService.java

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.SysManagementFileRel;
+
+import java.util.List;
+
+/**
+ * ClassName: ISysManagementFileRelService<br>
+ * Description: SysManagementFileRelService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-18  cuixq    由Generator自动创建
+ */
+public interface ISysManagementFileRelService extends IService<SysManagementFileRel> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<SysManagementFileRel>
+     * @return IPage<SysManagementFileRel>
+     */
+    IPage<SysManagementFileRel> findSysManagementFileRels(QueryRequest request, LambdaQueryWrapper<SysManagementFileRel> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<SysManagementFileRel>
+     * @return List<SysManagementFileRel>
+     */
+    List<SysManagementFileRel> findSysManagementFileRels(LambdaQueryWrapper<SysManagementFileRel> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param sysManagementFileRel sysManagementFileRel
+     */
+    void createSysManagementFileRel(SysManagementFileRel sysManagementFileRel);
+
+    /**
+     * 修改
+     *
+     * @param sysManagementFileRel sysManagementFileRel
+     */
+    void updateSysManagementFileRel(SysManagementFileRel sysManagementFileRel);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<SysManagementFileRel>
+     */
+    void deleteSysManagementFileRel(LambdaQueryWrapper<SysManagementFileRel> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/ISysManagementInfService.java

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.SysManagementInf;
+
+import java.util.List;
+
+/**
+ * ClassName: ISysManagementInfService<br>
+ * Description: SysManagementInfService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-17  cuixq    由Generator自动创建
+ */
+public interface ISysManagementInfService extends IService<SysManagementInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<SysManagementInf>
+     * @return IPage<SysManagementInf>
+     */
+    IPage<SysManagementInf> findSysManagementInfs(QueryRequest request, LambdaQueryWrapper<SysManagementInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<SysManagementInf>
+     * @return List<SysManagementInf>
+     */
+    List<SysManagementInf> findSysManagementInfs(LambdaQueryWrapper<SysManagementInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param sysManagementInf sysManagementInf
+     */
+    void createSysManagementInf(SysManagementInf sysManagementInf);
+
+    /**
+     * 修改
+     *
+     * @param sysManagementInf sysManagementInf
+     */
+    void updateSysManagementInf(SysManagementInf sysManagementInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<SysManagementInf>
+     */
+    void deleteSysManagementInf(LambdaQueryWrapper<SysManagementInf> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/ISysUserRoleService.java

@@ -5,15 +5,15 @@ import com.tianhu.system.domain.SysUserRole;
 
 /**
  * 用户和角色关联Service接口
- * 
+ *
  * @author keao
  * @date 2021-03-06
  */
-public interface ISysUserRoleService 
+public interface ISysUserRoleService
 {
     /**
      * 查询用户和角色关联
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 用户和角色关联
      */
@@ -21,7 +21,7 @@ public interface ISysUserRoleService
 
     /**
      * 查询用户和角色关联列表
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 用户和角色关联集合
      */
@@ -29,7 +29,7 @@ public interface ISysUserRoleService
 
     /**
      * 新增用户和角色关联
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ISysUserRoleService
 
     /**
      * 修改用户和角色关联
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ISysUserRoleService
 
     /**
      * 批量删除用户和角色关联
-     * 
+     *
      * @param userIds 需要删除的用户和角色关联ID
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface ISysUserRoleService
 
     /**
      * 删除用户和角色关联信息
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 结果
      */

tianhu-system/src/main/java/com/tianhu/system/service/ISysUserService.java

@@ -8,7 +8,7 @@ import com.tianhu.system.domain.OwnSysUser;
 
 /**
  * 用户 业务层
- * 
+ *
  * @author tianhu
  */
 public interface ISysUserService
@@ -16,7 +16,7 @@ public interface ISysUserService
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -30,7 +30,7 @@ public interface ISysUserService
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -38,7 +38,7 @@ public interface ISysUserService
 
     /**
      * 根据用户ID查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -54,7 +54,7 @@ public interface ISysUserService
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */
@@ -78,7 +78,7 @@ public interface ISysUserService
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     public void checkUserAllowed(SysUser user);
@@ -92,6 +92,14 @@ public interface ISysUserService
     public int insertUser(SysUser user);
 
     /**
+     * 新增角色对应
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public void insertUserRole(SysUser user);
+
+    /**
      * 新增用户信息
      *
      * @param user 用户信息
@@ -101,7 +109,7 @@ public interface ISysUserService
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -117,7 +125,7 @@ public interface ISysUserService
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -125,7 +133,7 @@ public interface ISysUserService
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -133,7 +141,7 @@ public interface ISysUserService
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
      * @param avatar 头像地址
      * @return 结果
@@ -142,7 +150,7 @@ public interface ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -150,7 +158,7 @@ public interface ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -159,7 +167,7 @@ public interface ISysUserService
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -167,7 +175,7 @@ public interface ISysUserService
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnManagementInfServiceImpl.java

@@ -0,0 +1,29 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.mapper.OwnManagementInfMapper;
+import com.tianhu.system.service.IOwnManagementInfService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户 业务层处理
+ *
+ * @author ruoyi
+ */
+@Service
+public class OwnManagementInfServiceImpl implements IOwnManagementInfService
+{
+    @Autowired
+    private OwnManagementInfMapper ownManagementInfMapper;
+
+
+    @Override
+    public List<Map> selectFundSide(Map map){
+        return ownManagementInfMapper.selectFundSide(map);
+    }
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/PayBankAccInfServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.PayBankAccInf;
+import com.tianhu.system.mapper.PayBankAccInfMapper;
+import com.tianhu.system.service.IPayBankAccInfService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: PayBankAccInfServiceImpl<br>
+ * Description: IPayBankAccInfService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class PayBankAccInfServiceImpl extends ServiceImpl<PayBankAccInfMapper, PayBankAccInf> implements IPayBankAccInfService {
+
+    @Autowired
+    private PayBankAccInfMapper payBankAccInfMapper;
+
+    @Override
+    public IPage<PayBankAccInf> findPayBankAccInfs(QueryRequest request, LambdaQueryWrapper<PayBankAccInf> wrapper) {
+        Page<PayBankAccInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<PayBankAccInf> findPayBankAccInfs(LambdaQueryWrapper<PayBankAccInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createPayBankAccInf(PayBankAccInf payBankAccInf) {
+        this.save(payBankAccInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePayBankAccInf(PayBankAccInf payBankAccInf) {
+        this.saveOrUpdate(payBankAccInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePayBankAccInf(LambdaQueryWrapper<PayBankAccInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysCompanyServiceImpl.java

@@ -1,17 +1,20 @@
 package com.tianhu.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.system.domain.SysCompany;
 import com.tianhu.system.mapper.SysCompanyMapper;
 import com.tianhu.system.service.ISysCompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
 
 import java.util.List;
 
@@ -21,7 +24,7 @@ import java.util.List;
  * Company: keao
  *
  * @author cuixq
- * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
+ * @version v1.0.0    2021-08-18  cuixq    由Generator自动创建
  */
 @Service
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysManagementFileRelServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.SysManagementFileRel;
+import com.tianhu.system.mapper.SysManagementFileRelMapper;
+import com.tianhu.system.service.ISysManagementFileRelService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: SysManagementFileRelServiceImpl<br>
+ * Description: ISysManagementFileRelService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-18  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class SysManagementFileRelServiceImpl extends ServiceImpl<SysManagementFileRelMapper, SysManagementFileRel> implements ISysManagementFileRelService {
+
+    @Autowired
+    private SysManagementFileRelMapper sysManagementFileRelMapper;
+
+    @Override
+    public IPage<SysManagementFileRel> findSysManagementFileRels(QueryRequest request, LambdaQueryWrapper<SysManagementFileRel> wrapper) {
+        Page<SysManagementFileRel> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<SysManagementFileRel> findSysManagementFileRels(LambdaQueryWrapper<SysManagementFileRel> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createSysManagementFileRel(SysManagementFileRel sysManagementFileRel) {
+        this.save(sysManagementFileRel);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysManagementFileRel(SysManagementFileRel sysManagementFileRel) {
+        this.saveOrUpdate(sysManagementFileRel);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSysManagementFileRel(LambdaQueryWrapper<SysManagementFileRel> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysManagementInfServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.SysManagementInf;
+import com.tianhu.system.mapper.SysManagementInfMapper;
+import com.tianhu.system.service.ISysManagementInfService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: SysManagementInfServiceImpl<br>
+ * Description: ISysManagementInfService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-17  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class SysManagementInfServiceImpl extends ServiceImpl<SysManagementInfMapper, SysManagementInf> implements ISysManagementInfService {
+
+    @Autowired
+    private SysManagementInfMapper sysManagementInfMapper;
+
+    @Override
+    public IPage<SysManagementInf> findSysManagementInfs(QueryRequest request, LambdaQueryWrapper<SysManagementInf> wrapper) {
+        Page<SysManagementInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<SysManagementInf> findSysManagementInfs(LambdaQueryWrapper<SysManagementInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createSysManagementInf(SysManagementInf sysManagementInf) {
+        this.save(sysManagementInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysManagementInf(SysManagementInf sysManagementInf) {
+        this.saveOrUpdate(sysManagementInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSysManagementInf(LambdaQueryWrapper<SysManagementInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserCompanyRelServiceImpl.java

@@ -41,7 +41,7 @@ public class SysUserCompanyRelServiceImpl extends ServiceImpl<SysUserCompanyRelM
 
     @Override
     public List<SysUserCompanyRel> findSysUserCompanyRels(LambdaQueryWrapper<SysUserCompanyRel> wrapper) {
-		return this.list(wrapper);
+        return this.list(wrapper);
     }
 
     @Override
@@ -59,6 +59,6 @@ public class SysUserCompanyRelServiceImpl extends ServiceImpl<SysUserCompanyRelM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteSysUserCompanyRel(LambdaQueryWrapper<SysUserCompanyRel> wrapper) {
-	    this.remove(wrapper);
-	}
+        this.remove(wrapper);
+    }
 }

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserRoleServiceImpl.java

@@ -9,19 +9,19 @@ import com.tianhu.system.service.ISysUserRoleService;
 
 /**
  * 用户和角色关联Service业务层处理
- * 
+ *
  * @author keao
  * @date 2021-03-06
  */
 @Service
-public class SysUserRoleServiceImpl implements ISysUserRoleService 
+public class SysUserRoleServiceImpl implements ISysUserRoleService
 {
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
 
     /**
      * 查询用户和角色关联
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 用户和角色关联
      */
@@ -33,7 +33,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService
 
     /**
      * 查询用户和角色关联列表
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 用户和角色关联
      */
@@ -45,7 +45,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService
 
     /**
      * 新增用户和角色关联
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService
 
     /**
      * 修改用户和角色关联
-     * 
+     *
      * @param sysUserRole 用户和角色关联
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService
 
     /**
      * 批量删除用户和角色关联
-     * 
+     *
      * @param userIds 需要删除的用户和角色关联ID
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService
 
     /**
      * 删除用户和角色关联信息
-     * 
+     *
      * @param userId 用户和角色关联ID
      * @return 结果
      */

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
 
 /**
  * 用户 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -67,7 +67,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @return 用户对象信息
      */
     @Override
@@ -90,7 +90,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -102,7 +102,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -145,7 +145,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */
@@ -207,7 +207,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     @Override
@@ -221,7 +221,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -232,7 +232,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
-        insertUserPost(user);
+//        insertUserPost(user);
         // 新增用户与角色管理
         insertUserRole(user);
         return rows;
@@ -259,7 +259,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -303,7 +303,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -315,7 +315,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -327,7 +327,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
      * @param avatar 头像地址
      * @return 结果
@@ -340,7 +340,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -352,7 +352,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -365,9 +365,10 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param user 用户对象
      */
+    @Override
     public void insertUserRole(SysUser user)
     {
         Long[] roles = user.getRoleIds();
@@ -418,7 +419,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户岗位信息
-     * 
+     *
      * @param user 用户对象
      */
     public void insertUserPost(SysUser user)
@@ -471,7 +472,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -488,7 +489,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -604,7 +605,7 @@ public class SysUserServiceImpl implements ISysUserService
             try
             {
                 // 验证是否存在这个用户
-            Map map = new HashMap();
+                Map map = new HashMap();
                 // 用户名称
                 String userName = user.getUserName();
                 //             用户姓名
@@ -647,54 +648,54 @@ public class SysUserServiceImpl implements ISysUserService
                 map1.put("companyId", companyId);
                 List<SysDept> list1 = sysDeptMapper.selectDeptByDeptName(map1);
 
-            Map map2 = new HashMap();
+                Map map2 = new HashMap();
                 // 角色名称
                 String roleName = user.getRoleName();
                 map2.put("roleName", roleName);
                 List<Map> list2 = sysRoleMapper.selectRoleByRoleName(map2);
                 //判断用户表是否有此用户
-            if (StringUtils.isNull(list) || list.size() > 0) {
+                if (StringUtils.isNull(list) || list.size() > 0) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "已存在");
-                //判断部门表是否有此部门
-            }else if (StringUtils.isNull(list1) || list1.size() == 0) {
+                    //判断部门表是否有此部门
+                }else if (StringUtils.isNull(list1) || list1.size() == 0) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "不存在");
-                //判断角色表是否有此角色
-            }else if (StringUtils.isNull(list2) || list2.size() == 0) {
+                    //判断角色表是否有此角色
+                }else if (StringUtils.isNull(list2) || list2.size() == 0) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "不存在");
-                //判断职级表是否有此职级
-            }if (!isMat) {
+                    //判断职级表是否有此职级
+                }if (!isMat) {
                 failureNum++;
                 failureMsg.append("<br/>邮箱" + email + "格式不正确");
             } else {
-                    //添加
-                    //根据部门名称查询部门Id
-                    SysDept dept = new SysDept();
-                    dept.setDeptName(deptName);
-                    List<SysDept> list3 = sysDeptMapper.selectDeptList(dept);
-                    Long deptId = list3.get(0).getDeptId();
-                    //根据角色名称查询角色Id
-                    SysRole role = new SysRole();
-                    role.setRoleName(roleName);
-                    List<SysRole> list4 = sysRoleMapper.selectRoleList(role);
-                    String roleId = String.valueOf(list4.get(0).getRoleId());
-                    String[] roles = roleId.split(" ");
-                    Long[] roleIds = (Long[]) ConvertUtils.convert(roles,Long.class);
-                    user.setDeptId(deptId);
-                    user.setUserName(userName);
-                    user.setCompanyId(companyId);
-                    user.setNickName(nickName);
-                    user.setRoleIds(roleIds);
-                    user.setEmail(email);
-                    user.setAvatar("");
-                    user.setSex(sex);
-                    user.setPassword(SecurityUtils.encryptPassword(password));
-                    user.setStatus(status);
-                    user.setCreateBy(SecurityUtils.getUsername());
-                    user.setRemark(remark);
-                    user.setStaffCode(staffCode);
+                //添加
+                //根据部门名称查询部门Id
+                SysDept dept = new SysDept();
+                dept.setDeptName(deptName);
+                List<SysDept> list3 = sysDeptMapper.selectDeptList(dept);
+                Long deptId = list3.get(0).getDeptId();
+                //根据角色名称查询角色Id
+                SysRole role = new SysRole();
+                role.setRoleName(roleName);
+                List<SysRole> list4 = sysRoleMapper.selectRoleList(role);
+                String roleId = String.valueOf(list4.get(0).getRoleId());
+                String[] roles = roleId.split(" ");
+                Long[] roleIds = (Long[]) ConvertUtils.convert(roles,Long.class);
+                user.setDeptId(deptId);
+                user.setUserName(userName);
+                user.setCompanyId(companyId);
+                user.setNickName(nickName);
+                user.setRoleIds(roleIds);
+                user.setEmail(email);
+                user.setAvatar("");
+                user.setSex(sex);
+                user.setPassword(SecurityUtils.encryptPassword(password));
+                user.setStatus(status);
+                user.setCreateBy(SecurityUtils.getUsername());
+                user.setRemark(remark);
+                user.setStaffCode(staffCode);
 //                    if (bir != null) {
 //                        Date birth = formatter.parse(bir);
 //                        String birthDate = formatter.format(birth);
@@ -710,42 +711,42 @@ public class SysUserServiceImpl implements ISysUserService
 //                        String leaveDate = formatter.format(leave);
 //                        user.setLeaveDate(leaveDate);
 //                    }
-                    if(bir != null && bir != "") {
-                        String y1 = bir.substring(0, 4);
-                        String m1 = bir.substring(5, 7);
-                        String d1 = bir.substring(8, 10);
-                        String birthDate = y1 + "-" + m1 + "-" + d1;
-                        user.setBirthDate(birthDate);
-                    }else{
-                        user.setBirthDate(bir);
-                    }
-                    if(ent != null && ent != "") {
-                        String y2 = ent.substring(0, 4);
-                        String m2 = ent.substring(5, 7);
-                        String d2 = ent.substring(8, 10);
-                        String entryDate = y2 + "-" + m2 + "-" + d2;
-                        user.setEntryDate(entryDate);
-                    }else {
-                        user.setEntryDate(ent);
-                    }
-                    if(lea != null && lea != "") {
-                        String y3 = lea.substring(0, 4);
-                        String m3 = lea.substring(5, 7);
-                        String d3 = lea.substring(8, 10);
-                        String leaveDate = y3 + "-" + m3 + "-" + d3;
-                        user.setLeaveDate(leaveDate);
-                    }else {
-                        user.setLeaveDate(lea);
-                    }
-                    user.setEducation(education);
-                    user.setPosition(position);
-                    user.setDelFlag("0");
-                    user.setCreateTime(DateUtils.getNowDate());
-                    this.insertUsers(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + " 导入成功");
-
+                if(bir != null && bir != "") {
+                    String y1 = bir.substring(0, 4);
+                    String m1 = bir.substring(5, 7);
+                    String d1 = bir.substring(8, 10);
+                    String birthDate = y1 + "-" + m1 + "-" + d1;
+                    user.setBirthDate(birthDate);
+                }else{
+                    user.setBirthDate(bir);
+                }
+                if(ent != null && ent != "") {
+                    String y2 = ent.substring(0, 4);
+                    String m2 = ent.substring(5, 7);
+                    String d2 = ent.substring(8, 10);
+                    String entryDate = y2 + "-" + m2 + "-" + d2;
+                    user.setEntryDate(entryDate);
+                }else {
+                    user.setEntryDate(ent);
+                }
+                if(lea != null && lea != "") {
+                    String y3 = lea.substring(0, 4);
+                    String m3 = lea.substring(5, 7);
+                    String d3 = lea.substring(8, 10);
+                    String leaveDate = y3 + "-" + m3 + "-" + d3;
+                    user.setLeaveDate(leaveDate);
+                }else {
+                    user.setLeaveDate(lea);
                 }
+                user.setEducation(education);
+                user.setPosition(position);
+                user.setDelFlag("0");
+                user.setCreateTime(DateUtils.getNowDate());
+                this.insertUsers(user);
+                successNum++;
+                successMsg.append("<br/>" + successNum + " 导入成功");
+
+            }
             }
             catch (Exception e)
             {

tianhu-system/src/main/resources/mapper/system/OwnManagementInfMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianhu.system.mapper.OwnManagementInfMapper">
+
+	<select id="selectFundSide" parameterType="map" resultType="map">
+		select
+		c.scy_id	 		 'scyId'  ,
+		c.scy_name 		     'scyName' ,
+		c.scy_license_file 	 'scyLicenseFile',
+		c.scy_social_code	 'scySocialCode',
+		c.scy_phone          'scyPhone',
+		c.scy_status     	 'scyStatus',
+		c.scy_type           'scyType',
+		s.smi_type           'smiType',
+		s.smi_agreement_type 'smiAgreementType',
+		s.smi_address		 'smiAddress',
+		s.smi_manager 	     'smiManager',
+		u.nick_name         'smiContract',
+		u.user_name          'smiContractPhone',
+		s.smi_desc     	     'smiDesc'
+		from  sys_company c
+		left join sys_management_inf s
+		on s.smi_company_id	= c.scy_id
+		left join sys_user u
+		on u.user_id = s.smi_contract_id
+		where c.scy_status != '99' and c.scy_type ='03'
+		<if test="scyId != null  and scyId != ''"> and c.scy_id = #{scyId}</if>
+		<if test="scyName != null  and scyName != ''"> and c.scy_name like concat('%', #{scyName}, '%')</if>
+		<if test="smiType != null  and smiType != ''"> and s.smi_type = #{smiType}</if>
+		<if test="smiManager != null  and smiManager != ''"> and s.smi_manager= #{smiManager}</if>
+		<if test="smiContract != null  and smiContract != ''"> and u.nick_name like concat('%', #{smiContract}, '%')</if>
+		<if test="smiContractPhone != null  and smiContractPhone != ''"> and u.user_name = #{smiContractPhone}</if>
+	</select>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/PayBankAccInfMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianhu.system.mapper.PayBankAccInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.PayBankAccInf">
+        <id column="PBAI_ID" property="pbaiId" />
+        <result column="PBAI_CSTNO" property="pbaiCstno" />
+        <result column="PBAI_ACCOUNT_NAME" property="pbaiAccountName" />
+        <result column="PBAI_ACCOUNTNO" property="pbaiAccountno" />
+        <result column="PBAI_BANKACCOUNT_ID" property="pbaiBankaccountId" />
+        <result column="PBAI_BANK_NAME" property="pbaiBankName" />
+        <result column="PBAI_STATUS" property="pbaiStatus" />
+        <result column="PBAI_BASIC" property="pbaiBasic" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
+		LEFT JOIN sys_company  c
+		ON c.scy_id =d.company_id
         where d.del_flag = '0'
         <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
@@ -38,17 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
-		and d.company_id in (
-			<if test="companyId != null and companyId != '' and companyId !='000000'">
-			SELECT scy_id FROM sys_company
-			left join
-			WHERE scy_status = '00'
-				and (scy_id = #{companyId})
-			</if>
-			<if test="companyId == '000000'">
-				#{companyId}
-			</if>
-		)
+		and d.company_id =	#{companyId}
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>

tianhu-system/src/main/resources/mapper/system/SysManagementFileRelMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianhu.system.mapper.SysManagementFileRelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.SysManagementFileRel">
+        <id column="smfr_company_id" property="smfrCompanyId" />
+        <result column="smfr_file_id" property="smfrFileId" />
+    </resultMap>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/SysManagementInfMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianhu.system.mapper.SysManagementInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.SysManagementInf">
+        <id column="smi_company_id" property="smiCompanyId" />
+        <result column="smi_type" property="smiType" />
+        <result column="smi_agreement_type" property="smiAgreementType" />
+        <result column="smi_address" property="smiAddress" />
+        <result column="smi_manager" property="smiManager" />
+        <result column="smi_contract_id" property="smiContractId" />
+        <result column="smi_desc" property="smiDesc" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tianhu.system.mapper.SysUserMapper">
 
 	<resultMap type="SysUser" id="SysUserResult">
@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUser" parameterType="SysUser" resultMap="SysUserResult">
 		select
-			u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.password, u.sex, u.status,
-			u.del_flag, u.login_ip, u.id_card, u.id_card_file, u.login_date, u.create_by, u.create_time, u.remark
+		u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.password, u.sex, u.status,
+		u.del_flag, u.login_ip, u.id_card, u.id_card_file, u.login_date, u.create_by, u.create_time, u.remark
 		from sys_user u
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
-	    <include refid="selectUserVo"/>
+		<include refid="selectUserVo"/>
 		where u.user_name = #{userName}
 		and u.del_flag = '0'
 	</select>
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkUserNameUnique" parameterType="map" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} and del_flag = '0'
 		<if test="companyId != null and companyId != ''">
-		 and company_id = #{companyId}
+			and company_id = #{companyId}
 		</if>
 		limit 1
 	</select>
@@ -115,67 +115,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
- 		insert into sys_user(
- 			<if test="userId != null and userId != 0">user_id,</if>
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
- 			<if test="userName != null and userName != ''">user_name,</if>
-			<if test="companyId != null and companyId != ''">company_id,</if>
- 			<if test="nickName != null and nickName != ''">nick_name,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="avatar != null and avatar != ''">avatar,</if>
- 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- 			<if test="sex != null and sex != ''">sex,</if>
- 			<if test="password != null and password != ''">password,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
-			<if test="staffCode != null and staffCode != ''">staff_code,</if>
-			<if test="birthDate != null and birthDate != ''">birth_date,</if>
-			<if test="entryDate != null and entryDate != ''">entry_date,</if>
-			<if test="leaveDate != null and leaveDate != ''">leave_date,</if>
-			<if test="education != null and education != ''">education,</if>
-			<if test="position != null and position != ''">position,</if>
- 			create_time
- 		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
- 			<if test="userName != null and userName != ''">#{userName},</if>
-			<if test="companyId != null and companyId != ''">#{companyId},</if>
- 			<if test="nickName != null and nickName != ''">#{nickName},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="avatar != null and avatar != ''">#{avatar},</if>
- 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- 			<if test="sex != null and sex != ''">#{sex},</if>
- 			<if test="password != null and password != ''">#{password},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
-			<if test="staffCode != null and staffCode != ''">#{staffCode},</if>
-			<if test="birthDate != null and birthDate != ''">#{birthDate},</if>
-			<if test="entryDate != null and entryDate != ''">#{entryDate},</if>
-			<if test="leaveDate != null and leaveDate != ''">#{leaveDate},</if>
-			<if test="education != null and education != ''">#{education},</if>
-			<if test="position != null and position != ''">#{position},</if>
- 			sysdate()
- 		)
+		insert into sys_user(
+		<if test="userId != null and userId != 0">user_id,</if>
+		<if test="deptId != null and deptId != 0">dept_id,</if>
+		<if test="userName != null and userName != ''">user_name,</if>
+		<if test="companyId != null and companyId != ''">company_id,</if>
+		<if test="nickName != null and nickName != ''">nick_name,</if>
+		<if test="email != null and email != ''">email,</if>
+		<if test="avatar != null and avatar != ''">avatar,</if>
+		<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+		<if test="sex != null and sex != ''">sex,</if>
+		<if test="password != null and password != ''">password,</if>
+		<if test="status != null and status != ''">status,</if>
+		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="remark != null and remark != ''">remark,</if>
+		<if test="staffCode != null and staffCode != ''">staff_code,</if>
+		<if test="birthDate != null and birthDate != ''">birth_date,</if>
+		<if test="entryDate != null and entryDate != ''">entry_date,</if>
+		<if test="leaveDate != null and leaveDate != ''">leave_date,</if>
+		<if test="education != null and education != ''">education,</if>
+		<if test="position != null and position != ''">position,</if>
+		create_time
+		)values(
+		<if test="userId != null and userId != ''">#{userId},</if>
+		<if test="deptId != null and deptId != ''">#{deptId},</if>
+		<if test="userName != null and userName != ''">#{userName},</if>
+		<if test="companyId != null and companyId != ''">#{companyId},</if>
+		<if test="nickName != null and nickName != ''">#{nickName},</if>
+		<if test="email != null and email != ''">#{email},</if>
+		<if test="avatar != null and avatar != ''">#{avatar},</if>
+		<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+		<if test="sex != null and sex != ''">#{sex},</if>
+		<if test="password != null and password != ''">#{password},</if>
+		<if test="status != null and status != ''">#{status},</if>
+		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="staffCode != null and staffCode != ''">#{staffCode},</if>
+		<if test="birthDate != null and birthDate != ''">#{birthDate},</if>
+		<if test="entryDate != null and entryDate != ''">#{entryDate},</if>
+		<if test="leaveDate != null and leaveDate != ''">#{leaveDate},</if>
+		<if test="education != null and education != ''">#{education},</if>
+		<if test="position != null and position != ''">#{position},</if>
+		sysdate()
+		)
 	</insert>
 
 	<update id="updateUser" parameterType="SysUser">
- 		update sys_user
- 		<set>
- 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
- 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- 			<if test="email != null and email != ''">email = #{email},</if>
- 			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
- 			<if test="sex != null and sex != ''">sex = #{sex},</if>
- 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- 			<if test="password != null and password != ''">password = #{password},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- 			<if test="loginDate != null">login_date = #{loginDate},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="remark != null">remark = #{remark},</if>
+		update sys_user
+		<set>
+			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+			<if test="userName != null and userName != ''">user_name = #{userName},</if>
+			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+			<if test="email != null and email != ''">email = #{email},</if>
+			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
+			<if test="sex != null and sex != ''">sex = #{sex},</if>
+			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+			<if test="password != null and password != ''">password = #{password},</if>
+			<if test="status != null and status != ''">status = #{status},</if>
+			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+			<if test="loginDate != null">login_date = #{loginDate},</if>
+			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="remark != null">remark = #{remark},</if>
 			<if test="staffCode != null">staff_code = #{staffCode},</if>
 			<if test="birthDate != null">birth_date = #{birthDate},</if>
 			<if test="entryDate != null">entry_date = #{entryDate},</if>
@@ -183,9 +183,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="education != null">education = #{education},</if>
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
 			<if test="position != null">position = #{position},</if>
- 			update_time = sysdate()
- 		</set>
- 		where user_id = #{userId}
+			update_time = sysdate()
+		</set>
+		where user_id = #{userId}
 	</update>
 
 	<update id="updateUserStatus" parameterType="SysUser">
@@ -204,10 +204,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		delete from sys_user where user_id = #{userId}
  	</delete>
 
- 	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach>
- 	</delete>
+	<delete id="deleteUserByIds" parameterType="Long">
+		update sys_user set del_flag = '2' where user_id in
+		<foreach collection="array" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
+	</delete>
 </mapper>