修改gisbim系统修改密码BUG

sxgk-projet/base-service/src/main/java/com/tofly/base/controller/UserController.java

@@ -15,6 +15,7 @@ import com.tofly.base.entity.*;
 import com.tofly.base.feign.ProjectResultIdFeign;
 import com.tofly.base.service.*;
 import com.tofly.base.utils.DesUtils;
+import com.tofly.base.utils.SmsUtils;
 import com.tofly.common.core.constant.CommonConstants;
 import com.tofly.common.core.constant.SecurityConstants;
 import com.tofly.common.core.entity.ResultRespone;
@@ -429,6 +430,9 @@ public class UserController {
         if(id!=null){
             u = userService.getById(id);
         }else{
+            if(SmsUtils.isPhoneNumber(user2.getUsername())) {
+                user2.setUsername(DesUtils.encrypt(user2.getUsername(), "toflysxgk"));
+            }
             u = userService.getUserByName(user2.getUsername());
         }
         id=u.getId();
@@ -934,12 +938,14 @@ public class UserController {
     }
 
     private void checkHandler(Long userid) {
-        log.info("验证级别的时候，当前用户级别："+SecurityUtils.getUser().getUserLevel());
-        if (CommonConstants.SUPER_ADMIN_ULEVEL.equals(SecurityUtils.getUser().getUserLevel())) {
-            return ;
-        }
-        if (SecurityUtils.getUserId().equals(userid)) {
-            return ;
+        if(SecurityUtils.getUser()!=null){
+            log.info("验证级别的时候，当前用户级别："+SecurityUtils.getUser().getUserLevel());
+            if (CommonConstants.SUPER_ADMIN_ULEVEL.equals(SecurityUtils.getUser().getUserLevel())) {
+                return ;
+            }
+            if (SecurityUtils.getUserId().equals(userid)) {
+                return ;
+            }
         }
 
         User user = userService.getById(userid);

sxgk-projet/base-service/src/main/resources/mapper/UserMapper.xml

@@ -41,7 +41,8 @@
     </select>
 
     <select id="getUserByName" resultMap="userMap" parameterType="java.lang.String">
-        select * from TF_SMPN_USER_X where upper(username)=#{username}
+        select * from TF_SMPN_USER_X where upper(username)= upper(#{username})
+                                        or PHONE=#{username}
     </select>
 
     <select id="getIds" resultType="java.util.Map">