修改bug

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -552,9 +552,15 @@ public class TUserController extends BaseController {
             boolean ret = false;
             TUser user = this.userService.getById(this.getUserId());
             byte[] salt = user.getPasswordSalt();
+            if (StringUtils.isBlank(oldPassWord.trim())) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "旧密码不能为空");
+                return resultMap;
+            }
             if (StringUtils.isBlank(password.trim())) {
                 resultMap.put("resultCode", "400");
-                resultMap.put("message", "旧密码不正确");
+                resultMap.put("message", "新密码不能为空");
+                return resultMap;
             }
             //密码解密
             oldPassWord= AESUtils.aesDecrypt(oldPassWord);
@@ -643,8 +649,9 @@ public class TUserController extends BaseController {
 
             user.setPassword(RandomUtil.createLetterRandom(6));
 
-            QueryWrapper<TUser> ew = new QueryWrapper<>();
+
             if (StringUtils.isNoneBlank(user.getUserName())) {
+                QueryWrapper<TUser> ew = new QueryWrapper<>();
                 user.setUserName(user.getUserName().trim());
                 ew.eq("is_deleted", false);
                 ew.eq("user_name", user.getUserName());
@@ -657,12 +664,13 @@ public class TUserController extends BaseController {
             }
 
             if (StringUtils.isNoneBlank(user.getOrgId())) {
+                QueryWrapper<TUser> ew = new QueryWrapper<>();
                 user.setOrgId(user.getOrgId());
                 ew.eq("is_deleted", 0);
                 ew.eq("type", "3");
                 ew.eq("org_id", user.getOrgId());
                 List<TUser> list = this.userService.list(ew);
-                if (list != null && list.size() > 1 && list.get(0) != null) {
+                if (list != null && !list.isEmpty()) {
                     resultMap.put("resultCode", "400");
                     resultMap.put("message", "该单位机顶盒账号已存在！");
                     return resultMap;