Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

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

@@ -64,7 +64,7 @@ public class TOrganController extends BaseController {
             ew.eq("is_deleted", 0);
             ew.eq("name", organ.getName());
             List<TOrgan> list = this.tOrganService.list(ew);
-            if (list != null && list.size() > 0 && list.get(0) != null) {
+            if (list != null && list.size()>0&&list.get(0)!=null) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "机构名称不能重复！");
                 return resultMap;

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

@@ -173,7 +173,7 @@ public class TUserController extends BaseController {
         try {
             TUser tUser = userService.selectById(id);
             List<Role> list = roleService.selectRoleByUserId(id);
-            if (list != null && list.size() > 0 && list.get(0) != null) {
+            if (list != null && list.size()>0&&list.get(0)!=null) {
                 List<String> list1 = new ArrayList<>();
                 list.forEach(r -> list1.add(r.getId()));
                 tUser.setRoleList(list1);
@@ -325,7 +325,7 @@ public class TUserController extends BaseController {
                     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.size()>0&&list.get(0)!=null) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "每个单位只能有一个机顶盒账号！");
                         return resultMap;
@@ -349,14 +349,16 @@ public class TUserController extends BaseController {
 //                user.setRealName(StringUtils.trimToNull(user.getRealName()));
                 user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
                 ret = userService.updateById(user);
-                //查询当前用户拥有的角色
-                QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
-                userRoleWrapper.eq("user_id", user.getId());
-                boolean remove = tUserRoleService.remove(userRoleWrapper);
 
 
                 List<String> list = user.getRoleList();
-                if (list != null && list.size() > 0 && list.get(0) != null) {
+
+                if (null != list && list.size()>0&&list.get(0)!=null) {
+                    //查询当前用户拥有的角色
+                    QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
+                    userRoleWrapper.eq("user_id", user.getId());
+                    boolean remove = tUserRoleService.remove(userRoleWrapper);
+
                     ArrayList<TUserRole> list1 = new ArrayList<>();
                     for (String r : list) {
                         TUserRole userRole = new TUserRole();
@@ -552,9 +554,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 +651,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 +666,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.size()>0&&list.get(0)!=null) {
                     resultMap.put("resultCode", "400");
                     resultMap.put("message", "该单位机顶盒账号已存在！");
                     return resultMap;