Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/GlobalSetServiceImpl.java

@@ -6,7 +6,6 @@ import cn.com.ty.lift.system.settings.dao.mapper.GlobalSetMapper;
 import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@ import java.util.List;
 public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet> implements GlobalSetService {
 
     @Override
-    @Transactional
     public void teamInitSetting(Long companyId) {
         List<GlobalSet> globalSetList = new ArrayList<>();
         //初始化默认值

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/LoginController.java

@@ -243,12 +243,12 @@ public class LoginController {
     private RestResponse judgeAuthCode(UserRequest userRequest) {
         //判断授权码
         if (StringUtils.isBlank(userRequest.getAuthCode())) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "授权码为空无法进行注册");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "授权码为空无法进行操作");
         }
         //通过授权码获取用户openId
         String openId = WxUtil.getOpenIdByAuthCode(userRequest.getAuthCode());
         if (StringUtils.isBlank(openId)) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "授权码无效无法进行注册");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "授权码无效无法进行操作");
         }
         userRequest.setWeChatOpenId(openId);
         return null;

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -85,10 +85,10 @@ public class LoginService implements ILoginService {
     public RestResponse login(HttpServletRequest request, UserRequest userRequest) {
         String password = userRequest.getPassword();
         if (StringUtils.isBlank(userRequest.getMobile())) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法注册");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法登录");
         }
         if (StringUtils.isBlank(password)) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户密码为空无法注册");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户密码为空无法登录");
         }
         //通过手机号获取用户账户信息
         UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserAccountService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author huangyuan
@@ -30,7 +29,6 @@ public class UserAccountService extends ServiceImpl<UserAccountMapper, UserAccou
     }
 
     @Override
-    @Transactional
     public boolean updateUserAccount(UserAccount userAccount) {
         return this.update(userAccount, new UpdateWrapper<UserAccount>()
         .eq("user_id", userAccount.getUserId())

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserInfoService.java

@@ -7,7 +7,6 @@ import cn.com.ty.lift.system.user.service.IUserInfoService;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +26,6 @@ public class UserInfoService extends ServiceImpl<UserInfoMapper, UserInfo> imple
     }
 
     @Override
-    @Transactional
     public boolean updateUserInfo(UserInfo userInfo) {
         return this.update(userInfo, new UpdateWrapper<UserInfo>()
         .eq("user_id", userInfo.getUserId())

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -56,6 +56,7 @@ public class UserService implements IUserService {
     private IProjectService projectService;
 
     @Override
+    @Transactional
     public UserAccount saveUserInfo(UserRequest userRequest) {
         String password = userRequest.getPassword();
         UserAccount userAccount = new UserAccount();
@@ -105,7 +106,6 @@ public class UserService implements IUserService {
     }
 
     @Override
-    @Transactional
     public RestResponse addUser(UserRequest userRequest) {
         //保存用户信息，成功返回用户账户信息，失败返回空
         UserAccount userAccount = this.saveUserInfo(userRequest);