diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java index 7713a225..a4a58c78 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java @@ -27,7 +27,7 @@ public class ProjectInformation extends BaseEntity { private String enterpriseSid; private String industrySid; private String typeSid; - private String useLimit; + private double useLimit; private String loanDate; private String useDate; //银行规定质押率 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java index d62abf0b..7a86d26a 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java @@ -46,7 +46,7 @@ public class ProjectInformationDto implements Dto { //项目说明 private String remarks; //用信总额 - private String useLimit; + private double useLimit; //放款日期 private String loanDate; //用信日期 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java index 98d5eed7..9ff61b70 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java @@ -60,7 +60,7 @@ public class ProjectInformationVo implements Vo { private String engaDate; private String url; private List enterpriseProjectVoList; - private String useLimit; + private double useLimit; private String loanDate; private String useDate; private String bankPledgeRate; diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index d233d23a..3b958e8a 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -242,7 +242,9 @@ public class SysUserService extends MybatisBaseService { roles.add(sysRole.getName()); } } - entity.setName(sysStaffinfo.getName()); + if(null!=sysStaffinfo){ + entity.setName(sysStaffinfo.getName()); + } entity.setRoleNames(roles); return entity; }