Browse Source

小程序查询权限修改为自己、审核人和部门负责人

anderx 4 years ago
parent
commit
b2a8041e61

+ 13 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -104,6 +104,19 @@ public class AdminListBo {
 	 */
 	private String reviewer;
 
+	/**
+	 * 部门负责人
+	 */
+	private String depManager;
+
+	public String getDepManager() {
+		return depManager;
+	}
+
+	public void setDepManager(String depManager) {
+		this.depManager = depManager;
+	}
+
 	public String getReviewer() {
 		return reviewer;
 	}

+ 4 - 2
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -763,10 +763,12 @@
                                      left join `role` c on b.rid=c.id
     where c.role_name  = #{name,jdbcType=VARCHAR} and a.status='正常'
   </select>
-  <!-- 获得当前登录人的名字和部门名 -->
+
+
   <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
     select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email,a.superior_id superiorId,a.open_id openId,
-    a.reviewer from admin a left join department d on a.department_id = d.id
+           a.reviewer,d.manager_id depManager
+    from admin a left join department d on a.department_id = d.id
     where a.id = #{_parameter,jdbcType=VARCHAR}
   </select>
 

+ 13 - 5
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -269,11 +269,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public OutPublicRelease dtails(Integer id) {
 		OutPublicRelease out=publicReleaseMapper.selectDtails(id,null);
 		//如果不是本人和审核人员则不返回信息
-		if(out!=null&&
-				!TokenManager.getAdminId().equals( out.getAid())&&
-				!TokenManager.getAdminId().equals(out.getSuprId())&&
-				!TokenManager.getAdminId().equals(out.getReviewer())) {
-			out=null;
+		if(out!=null){
+			boolean flag=false;
+			//自己、审核人员与部门负责人可以查看
+			if (!TokenManager.getAdminId().equals( out.getAid())&&
+					!TokenManager.getAdminId().equals(out.getReviewer())){
+				flag=true;
+			}else {
+				AdminListBo ab=adminMapper.getDeptNameByAid(out.getAid());
+				if (!TokenManager.getAdminId().equals(ab.getDepManager())){
+					flag=true;
+				}
+			}
+			if(flag=true)out=null;
 		}else if(TokenManager.getAdminId().equals(out.getAid())) {
 			out.setPermission(0);
 		}else {

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -50,7 +50,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.98
+static.host=//static.jishutao.com/1.1.99
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #提前提醒天数
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.1.98
+static.host=//static.jishutao.com/1.1.99
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload