diff --git a/src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java b/src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
index 22fc5f93dcfc0e5b5aad6690998825d30bd91b43..cb0254c03622ef12e60ce31332ef8a72e656d9bd 100644
--- a/src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
+++ b/src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
@@ -88,7 +88,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
                 ew.eq("is_deleted", 0);
                 ew.eq("name", organ.getName());
                 List<TOrgan> list = list(ew);
-                if (list != null&&list.size()>0&&list.get(0)!=null) {
+                if (null != list && !list.isEmpty()) {
                     throw new Exception("机构名称不能重复!");
                 }
             }else {
diff --git a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java b/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
index f6c6727f4ae59a02f8755167ed76f45fb6a4f458..5548ca27c7faedbc411b6d1787f819197e391a32 100644
--- a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
+++ b/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
@@ -663,14 +663,14 @@ public class ChinaMobileRestApiController extends BaseController {
         qw.eq("is_current", 1);
         qw.select().orderByDesc("create_time");
         List<TAppDirPic> currentDirList = appDirPicService.list(qw);
-        if (currentDirList != null && currentDirList.size() > 0) {
+        if (null != currentDirList && !currentDirList.isEmpty()) {
             currentDir = currentDirList.get(0);
         }
         QueryWrapper<TAppRunPic> qw1 = new QueryWrapper<>();
         qw1.eq("is_current", 1);
         qw1.select().orderByDesc("create_time");
         List<TAppRunPic> currentRunList = appRunPicService.list(qw1);
-        if (currentRunList != null && currentRunList.size() > 0) {
+        if (null != currentDirList && !currentDirList.isEmpty()) {
             currentRun = currentRunList.get(0);
         }
 
diff --git a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java b/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
index 840826a4214b291d34fa43190051e39d086794a8..e0ffd2d777918a94d5f876fb55129eaf9f8f65ec 100644
--- a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
+++ b/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 (null != list && !list.isEmpty()) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "机构名称不能重复！");
                 return resultMap;
diff --git a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java b/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
index 143eb51d94be5ae903b56de653b06a88602aacd6..3d98827e7bfb1aa494f48aa5401ff90452149d8b 100644
--- a/src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
+++ b/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 (null != list && !list.isEmpty()) {
                 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 (null != list && !list.isEmpty()) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "每个单位只能有一个机顶盒账号！");
                         return resultMap;
@@ -356,7 +356,7 @@ public class TUserController extends BaseController {
 
 
                 List<String> list = user.getRoleList();
-                if (list != null && list.size() > 0 && list.get(0) != null) {
+                if (null != list && !list.isEmpty()) {
                     ArrayList<TUserRole> list1 = new ArrayList<>();
                     for (String r : list) {
                         TUserRole userRole = new TUserRole();