用户的角色显示

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java

@@ -111,4 +111,6 @@ public class CommonContract extends BaseEntity {
     private String taskId;
     @ApiModelProperty("生成的合同的url")
     private String commonContractUrl;
+
+    private String configSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1402,8 +1402,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     commonContract.setPartyA(createOrgName);
                     commonContract.setPartyB(customerName);
                     //签订日期、签订地点
-                    //订金、合同金额
+                    commonContract.setCreateDate(new Date());
+                    commonContract.setAddress("");
+                    //订金
                     commonContract.setDeposit(new BigDecimal(depositTotal));
+                    //合同金额
                     commonContract.setContractAmount(depositTotal);
                     //合同附件
                     //身份证信息附件
@@ -1411,6 +1414,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     commonContract.setModelSid(appOrderModelInfoVo.getModelSid());
                     //车型名称
                     commonContract.setModelName(appOrderModelInfoVo.getModelName());
+                    commonContract.setConfigSid(appOrderModelInfoVo.getConfigSid());
                     //车辆台数
                     commonContract.setNum(Integer.valueOf(num).intValue());
                     //车辆单价

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml

@@ -79,7 +79,7 @@
     </select>
 
     <select id="selectByUserSid" resultType="java.lang.String">
-        select GROUP_CONCAT(sr.name SEPARATOR '/') as roleName
+        select GROUP_CONCAT(sr.name SEPARATOR '|') as roleName
         from sys_user_role sur
                  left join sys_role sr on sur.roleSid = sr.sid
         where sur.userSid = #{sid}