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

src/main/java/cn/chnmuseum/party/web/controller/AuditController.java

@@ -262,7 +262,6 @@ public class AuditController extends BaseController {
                     } else if (user.getRoleList().contains("10")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
                         two = true;
-                        auditStatusLevel = AuditStatusEnum.TBC;
                         if (user.getRoleList().contains("9")) {
                             one = true;
                         }
@@ -280,7 +279,6 @@ public class AuditController extends BaseController {
                     } else if (user.getRoleList().contains("12")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
                         two = true;
-                        auditStatusLevel = AuditStatusEnum.TBC;
                         if (user.getRoleList().contains("11")) {
                             one = true;
                         }
@@ -298,7 +296,6 @@ public class AuditController extends BaseController {
                     } else if (user.getRoleList().contains("14")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
                         two = true;
-                        auditStatusLevel = AuditStatusEnum.TBC;
                         if (user.getRoleList().contains("13")) {
                             one = true;
                         }

src/main/java/cn/chnmuseum/party/web/controller/LoginController.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -241,6 +242,28 @@ public class LoginController extends BaseController {
         return getFailResult("注销错误");
     }
 
+
+    @RequestMapping(value = "logoutUser", method = RequestMethod.GET)
+    public Map<String, Object> logoutUser(String id) {
+        try {
+            Set<String> keys = stringRedisTemplate.keys(SHIRO_JWT_TOKEN + "*");
+            ValueOperations<String, String> value = stringRedisTemplate.opsForValue();
+            for (String key : keys) {
+                if (id.equals(value.get(key))){
+                    stringRedisTemplate.delete(key);
+                }
+            }
+            JSONObject resultMap = new JSONObject();
+            resultMap.put("resultCode", "200");
+            resultMap.put("message", "成功");
+            resultMap.put("data", "");
+            return resultMap;
+        } catch (Exception e) {
+            LOGGER.error("注销错误", e);
+        }
+        return getFailResult("注销错误");
+    }
+
     @RequestMapping(value = {"/verifyCode"}, method = {RequestMethod.GET})
     public void verifyCode(HttpServletResponse response, Integer width, Integer height) {
         String uuid = UUID.randomUUID().toString();

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

@@ -167,6 +167,14 @@ public class TOrganController extends BaseController {
     public Map<String, Object> deleteTOrgan(String id) {
         boolean result;
         try {
+            List<TUser> list = userService.list(new UpdateWrapper<TUser>().eq("org_id", id).eq("is_deleted", "0"));
+            if (list!=null&&list.size()>0&&list.get(0)!=null){
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("resultCode","500");
+                map.put("message","机构下存在用户，不可以删除！");
+                map.put("data","");
+                return map;
+            }
             TOrgan tOrgan = tOrganService.getById(id);
             tOrgan.setIsDeleted(true);
             tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));