--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/user/UserController.java

@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
+import com.zrqx.core.vo.usersys.EditorListVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -187,4 +189,16 @@ public class UserController {
 		return CallBack.success(uservo);
 	}
 
+	@GetMapping("/editor/list")
+	@ApiOperation(value = "查询编辑部及其子部门下的所有用户", notes = "新书模块使用")
+	public CallBack<List<EditorListVo>> listEditor() {
+		return CallBack.success(userSerivce.queryEditors());
+	}
+
+	@GetMapping("/get/audit/auth")
+	@ApiOperation(value = "获取当前用户的选题申报审核权限", notes = "1-2-1: 室主任审批权限0/1；1-2-2: 选题委员会审批权限0/1；1-2-3: 设领导审批权限0/1")
+	public CallBack<JSONObject> getAuditAuth() {
+		return CallBack.success(userSerivce.queryCurrentUserAuditAuth());
+	}
+
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/user/UserMapper.java

@@ -2,6 +2,7 @@ package com.zrqx.sysuser.bg.mapper.user;
 
 import java.util.List;
 
+import com.zrqx.core.vo.usersys.EditorListVo;
 import org.apache.ibatis.annotations.Many;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
@@ -71,4 +72,34 @@ public interface UserMapper extends BaseMapper<User> {
 				many = @Many(select = "com.zrqx.sysuser.bg.mapper.user.UserRoleRelationMapper.selectList"))  
 	})  
 	List<UserVO> getPage(@Param("form")QueryUserForm form);
+
+	@Select(" SELECT su.userid as userId, su.username as userName "
+			+ " FROM sys_user su "
+			+ " WHERE userid IN ( "
+			+ " SELECT DISTINCT (userid) "
+			+ " FROM sys_department sd "
+			+ " RIGHT JOIN sys_user_department sud ON sd.departmentid = sud.departmentid "
+			+ " WHERE code LIKE concat( "
+			+ " (SELECT code "
+			+ " FROM sys_department "
+			+ " WHERE departmentName = '编辑部') "
+			+ "  , '%') " +
+			")")
+	List<EditorListVo> findEditor();
+
+	@Select("SELECT CASE " +
+			"           WHEN sd.departmentName = '编辑部' THEN '1-2-1' " +
+			"           WHEN sd.departmentName = '总编室' THEN '1-2-2' " +
+			"           WHEN sd.departmentName = '社领导' THEN '1-2-3' " +
+			"           ELSE 0 " +
+			"           END " +
+			"FROM sys_user su " +
+			"         LEFT JOIN sys_user_department sud ON su.userid = sud.userid " +
+			"         LEFT JOIN sys_department sd ON sud.departmentid = sd.departmentid " +
+			"         LEFT JOIN sys_user_role sur ON su.userid = sur.userid " +
+			"         LEFT JOIN sys_role sr ON sr.roleid = sur.roleid " +
+			"WHERE su.userid = #{userid}  " +
+			"  AND sd.departmentName IN ('编辑部', '总编室', '社领导') " +
+			"  AND sr.roleName = '选题审核'")
+	List<String> findCurrentUserAuditAuth(@Param("userid") String userid);
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/user/UserService.java

@@ -2,6 +2,7 @@ package com.zrqx.sysuser.bg.service.user;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zrqx.core.form.sysuser.bg.user.QueryUserForm;
 import com.zrqx.core.form.sysuser.bg.user.SaveUserForm;
 import com.zrqx.core.model.sysuser.user.User;
@@ -11,6 +12,8 @@ import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.sysuser.bg.dept.DeptVO;
 import com.zrqx.core.vo.sysuser.bg.role.RoleVO;
 import com.zrqx.core.vo.sysuser.bg.user.UserVO;
+import com.zrqx.core.vo.usersys.EditorListVo;
+
 /**
  * 
  * 用户service
@@ -60,4 +63,16 @@ public interface UserService extends BaseService<User,String> {
 	
 	/** 查询角色集合*/
 	List<RoleVO> getRole(String userId);
+
+	/**
+	 * 查询所有编辑部下的用户
+	 * @return
+	 */
+	List<EditorListVo> queryEditors();
+
+	/**
+	 * 查询当前用户选题申报权限
+	 * @return
+	 */
+	JSONObject queryCurrentUserAuditAuth();
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/user/UserServiceImpl.java

@@ -4,6 +4,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.alibaba.fastjson.JSONObject;
+import com.zrqx.core.enums.BooleanStatusEnum;
+import com.zrqx.core.enums.newbook.SelectedSubjectEnum;
+import com.zrqx.core.vo.usersys.EditorListVo;
+import com.zrqx.sysuser.commons.redis.Redis;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,6 +47,8 @@ public class UserServiceImpl extends BaseServiceImpl<User,String> implements Use
 	private UserDepartmentRelationMapper udMapper;
 	@Autowired
 	private UserRoleRelationMapper urMapper;
+	@Autowired
+	private Redis redis;
 	/**
 	 * 新增和修改
 	 */
@@ -207,4 +214,42 @@ public class UserServiceImpl extends BaseServiceImpl<User,String> implements Use
 	public List<RoleVO> getRole(String userId) {
 		return urMapper.getRole(userId);
 	}
+
+	@Override
+	public List<EditorListVo> queryEditors() {
+		//查询编辑部与用户的关联关系
+		return userMapper.findEditor();
+	}
+
+	@Override
+	public JSONObject queryCurrentUserAuditAuth() {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_1.getCode(), BooleanStatusEnum.NO.getCode());
+		jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_2.getCode(), BooleanStatusEnum.NO.getCode());
+		jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_3.getCode(), BooleanStatusEnum.NO.getCode());
+
+		List<String> auth = userMapper.findCurrentUserAuditAuth(redis.getUser().getUserId());
+		if (auth == null || auth.size() == 0) {
+			return jsonObject;
+		}
+
+		for (String s : auth) {
+			//待室主任审核权限
+			if (SelectedSubjectEnum.PENDING_REVIEW_1.getCode().equals(s)) {
+				jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_1.getCode(), BooleanStatusEnum.YES.getCode());
+			}
+
+			//待总编室审核权限
+			if (SelectedSubjectEnum.PENDING_REVIEW_2.getCode().equals(s)) {
+				jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_2.getCode(), BooleanStatusEnum.YES.getCode());
+			}
+
+			//待设领导审核权限
+			if (SelectedSubjectEnum.PENDING_REVIEW_3.getCode().equals(s)) {
+				jsonObject.put(SelectedSubjectEnum.PENDING_REVIEW_3.getCode(), BooleanStatusEnum.YES.getCode());
+			}
+		}
+
+		return jsonObject;
+	}
 }