Commit 91b4dbad authored by liqin's avatar liqin 💬

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

parents 9f392bd3 39e94380
...@@ -262,7 +262,6 @@ public class AuditController extends BaseController { ...@@ -262,7 +262,6 @@ public class AuditController extends BaseController {
} else if (user.getRoleList().contains("10")) { } else if (user.getRoleList().contains("10")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true; two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("9")) { if (user.getRoleList().contains("9")) {
one = true; one = true;
} }
...@@ -280,7 +279,6 @@ public class AuditController extends BaseController { ...@@ -280,7 +279,6 @@ public class AuditController extends BaseController {
} else if (user.getRoleList().contains("12")) { } else if (user.getRoleList().contains("12")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true; two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("11")) { if (user.getRoleList().contains("11")) {
one = true; one = true;
} }
...@@ -298,7 +296,6 @@ public class AuditController extends BaseController { ...@@ -298,7 +296,6 @@ public class AuditController extends BaseController {
} else if (user.getRoleList().contains("14")) { } else if (user.getRoleList().contains("14")) {
auditStatusLevel = AuditStatusEnum.TBCA; auditStatusLevel = AuditStatusEnum.TBCA;
two = true; two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("13")) { if (user.getRoleList().contains("13")) {
one = true; one = true;
} }
......
...@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -241,6 +242,28 @@ public class LoginController extends BaseController { ...@@ -241,6 +242,28 @@ public class LoginController extends BaseController {
return getFailResult("注销错误"); 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}) @RequestMapping(value = {"/verifyCode"}, method = {RequestMethod.GET})
public void verifyCode(HttpServletResponse response, Integer width, Integer height) { public void verifyCode(HttpServletResponse response, Integer width, Integer height) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
......
...@@ -167,6 +167,14 @@ public class TOrganController extends BaseController { ...@@ -167,6 +167,14 @@ public class TOrganController extends BaseController {
public Map<String, Object> deleteTOrgan(String id) { public Map<String, Object> deleteTOrgan(String id) {
boolean result; boolean result;
try { 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 tOrgan = tOrganService.getById(id);
tOrgan.setIsDeleted(true); tOrgan.setIsDeleted(true);
tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment