Browse Source

10/18

master
wangpengfei 2 years ago
parent
commit
781d2de6fe
  1. 4
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
  2. 1
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
  3. 2
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
  4. 2
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

4
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@ -225,8 +225,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
//主体
SysUser sysUser = sysUserFeign.getUserBySid(bank.getManagerSid()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(bank.getBankSid()).getData();
bank.setSysUser(sysUser);
bank.setSysOrganizationVo(sysOrganizationVo);
bank.setBankName(sysOrganizationVo.getName());
bank.setBManagerName(sysUser.getName());
projectInfoVo.setBaseInfo(bank);
projectInfoVo.setSid(bank.getSid());
//企业

1
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java

@ -74,4 +74,5 @@ public class SysUser extends BaseEntity {
private String unionid;
//d订阅状态
private String subscriptionStatus;
private String name;
}

2
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java

@ -74,4 +74,6 @@ public class SysUser extends BaseEntity {
private String unionid;
//d订阅状态
private String subscriptionStatus;
@TableField(exist = false)
private String name;
}

2
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@ -233,6 +233,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
}
public SysUser getUserBySid(String sid) {
SysUser entity = this.fetchBySid(sid);
SysStaffinfo sysStaffinfo=sysStaffinfoService.fetchBySid(entity.getStaffSid());
List<SysUserRole> s=userRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sid));
List<String> roles=new ArrayList<>();
for(SysUserRole sysUserRole:s){
@ -241,6 +242,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
roles.add(sysRole.getName());
}
}
entity.setName(sysStaffinfo.getName());
entity.setRoleNames(roles);
return entity;
}

Loading…
Cancel
Save