Merge remote-tracking branch 'origin/dev' into test

5 years ago · 50ec4bc4b5
parent 0dd43b89e9 addcb68ed6
commit 50ec4bc4b5
1 changed files with 3 additions and 1 deletions
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
@ -395,7 +395,9 @@ public class SysUserInfoController extends CoreBaseController{
                for (SysRefUserRole sysRefUserRole : sysRefUserRoleList) {
                    roleName.append(sysRefUserRole.getRoleNameRdd()).append(",");
                }
-                roleName.setLength(roleName.length() - 1);
+                if (roleName.length() != 0) {
+                    roleName.setLength(roleName.length() - 1);
+                }

                // 封装model
                userExportModel = new UserExportModel(sysUserMap.get(userInfoItem.getUserId()), userInfoItem);