【积分银行】积分

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java

@@ -830,7 +830,6 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Result<String> addUserInfo(UserEmployee userEmployee) {
         // 密码解密
         String key = RSAEncryptUtils.decrypt1(userEmployee.getPassword(), CommonConstant.PRIVATE_KEY);

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java

@@ -122,12 +122,12 @@ public class LoginAnYanServiceImpl implements ILoginAnYanService {
         try {
             // 授权成功获取用户信息(统一认证的平台接口没有做统一封装,成功和失败均返回一个不同的json字符串, 这里只能判断没有获取到用户信息则认为是失败)
             anYanUserInfo = anYanClient.getAnYanUserInfo(anYanAuthResult.getAccess_token(), username);
-            if (anYanUserInfo == null || anYanUserInfo.getEmployeeUnitDTO() == null) {
-                return Result.error("登录失败，请先联系本单位掌油管理员确认个人机构信息");
-            }
         } catch (Exception e) {
             log.error("获取用户信息异常: {}", e.getMessage());
         }
+        if (anYanUserInfo == null || anYanUserInfo.getEmployeeUnitDTO() == null) {
+            return Result.error("登录失败，请先联系本单位掌油管理员确认个人机构信息");
+        }
 
         try {
             // 检查并更新用户信息