lin.liu 2 veckor sedan
förälder
incheckning
f1d9c4da72

+ 1 - 1
secure-producting-system/src/main/java/com/customs/cq/datacenter/system/h4a/service/H4AService.java

@@ -470,7 +470,7 @@ public class H4AService {
         try {
             rolesOfUser = H4AReaderHelper.getRolesOfUser(userGuid, orgGuid, appCode);
         } catch (Exception e) {
-            throw new H4AException(String.format("获取H4A人员角色失败,人员GUID:%s,部门GUID:%s", userGuid, orgGuid), e);
+            return new ArrayList<>();
         }
         return wrapRolesOfUser(rolesOfUser);
     }

+ 3 - 1
secure-producting-system/src/main/java/com/customs/cq/datacenter/system/service/impl/SysUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.customs.cq.datacenter.common.enums.EResultCode;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
 import com.customs.cq.datacenter.common.utils.ListUtil;
 import com.customs.cq.datacenter.system.domain.SysUserRole;
@@ -488,6 +489,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                     sysUser = new SysUser();
                     sysUser.setPassword(BCrypt.hashpw("123456"));
                     sysUser.setStatus("0");
+                    sysUser.setUserType("sys_user");
                 }
                 sysUser.setEmail(user.getEmail());
 
@@ -524,7 +526,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                 result++;
             }
         } catch (H4AException e) {
-            e.printStackTrace();
+            throw new ServiceException(e.getMsg(), EResultCode.ERROR.getCode());
         }
         return result;
     }