测试word替换的问题

src/main/java/platform/common/Constant.java

@@ -47,6 +47,7 @@ public final class Constant {
     public static final String USER_HAS_REGISTERING = "账号注册中!";
     public static final String USER_REVIEWING = "账户审核中!";
     public static final String USER_ERROR_MANY = "密码错误次数过多!";
+    public static final String USER_PHONE_EMPTY = "用户手机号未完善!";
 
 
     public static final String SYSTEM_ERRORS = "系统错误!";

src/main/java/platform/modules/company/web/ProjectProvincesController.java

@@ -106,7 +106,7 @@ public class ProjectProvincesController extends BaseController {
         projectProvincesService.getDictInfo(modelMap);
         ProjectProvincesDeclaration projectProvincesDeclaration = projectProvincesDeclarationService.findById(declarationId);
         ProjectProvinces project = new ProjectProvinces();
-        if (projectProvincesDeclaration.getIs_comprehensive().equals("0")) {
+        if ("0".equals(projectProvincesDeclaration.getIs_comprehensive())) {
             project.setIs_comprehensive(false);
         } else {
             project.setIs_comprehensive(true);

src/main/java/platform/modules/government/service/UserService.java

@@ -678,9 +678,9 @@ public class UserService extends BaseService<User> {
         List<User> users = this.findListByWhere(user);
         if (users != null && users.size() > 0) {
             for (User user1 : users) {
-                if (user1.getPhone() != null && user1.getPhone() != "") {
+//                if (user1.getPhone() != null && user1.getPhone() != "") {
                     return user1;
-                }
+//                }
             }
 //            return users.get(0);
         }

src/main/java/platform/modules/home/web/HomeRefactorController.java

@@ -615,7 +615,10 @@ public class HomeRefactorController extends BaseController {
                 log.info("对用户进行登录验证..验证通过! username = {}", username);
                 ModelMap modelMap = new ModelMap();
                 this.commonObject(modelMap, false);
-
+                User user = userService.getUser(ShiroUtils.getUserId());
+                if ((user.getPhone() == null || "".equals(user.getPhone()))) {
+                    return ResponseMessage.success(Constant.USER_PHONE_EMPTY, user);
+                }
                 //获取token
                 modelMap.put("token", userService.createToken());
                 return ResponseMessage.success(Constant.USER_LOGIN_IN, modelMap);
@@ -719,6 +722,29 @@ public class HomeRefactorController extends BaseController {
         }
     }
 
+    @PutMapping("/complete")
+    @OperationLog("完善手机号")
+    @ResponseBody
+    public ResponseMessage complete(@RequestBody User userInfo) throws Exception {
+        try {
+            if (!verificationCodeUtil.validateVerificationCode(userInfo.getPhone(), userInfo.getValidateNum())) {
+                return ResponseMessage.error("验证码错误！");
+            }
+
+            User user = new User();
+            user.setId(userInfo.getId());
+            /*user.setUser_name(userInfo.getUser_name());
+            user.setNick_name(userInfo.getNick_name());*/
+            user.setPhone(userInfo.getPhone());
+            userService.updateSelective(user);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseMessage.error("注册失败" + e.getMessage());
+        }
+        return ResponseMessage.success("完善信息成功！请重新登录！");
+    }
+
     public void commonObject(ModelMap modelMap, Boolean isNav) throws Exception {
         Logo logo = logoService.findLogo();
         modelMap.put("fileUrl", setFileUrl());