From cfa8c9574e0d78fbd2b44435dc0846ef03edb829 Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Fri, 17 Jul 2020 17:55:47 +0800
Subject: [PATCH] =?UTF-8?q?20200717=20zjt=20=E4=BF=AE=E6=94=B9app=E7=BD=91?=
 =?UTF-8?q?=E6=8A=A5=E6=8A=A5=E9=94=80=E5=AE=A1=E6=A0=B8=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/MailReminderMapper.xml   |  2 +-
 .../security/wb/ribs/biz/ApproveRoleBiz.java  | 38 +++++---
 .../resources/mapper/ribs/ApproRoleMapper.xml | 88 ++++++++++++-------
 3 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/mapper/MailReminderMapper.xml b/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/mapper/MailReminderMapper.xml
index ec753be..e2ef71b 100644
--- a/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/mapper/MailReminderMapper.xml
+++ b/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/mapper/MailReminderMapper.xml
@@ -17,7 +17,7 @@
                     GROUP BY naas1.DEPT_CODE) countT ON naas.DEPT_CODE = countT.DEPT_CODE
         WHERE
             twrud.STAFF_ID = naas.ID
-        AND twrud.ROLE_ID = '1'
+        AND (twrud.ROLE_ID = '1' or twrud.ROLE_ID = '2')
         AND countT.countNum &gt; 0
     </select>
 
diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java
index 0547a05..055532f 100644
--- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java
+++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/ApproveRoleBiz.java
@@ -123,8 +123,18 @@ public class ApproveRoleBiz extends BaseBiz<ApproveRoleMapper, ApproveRoleVo> {
             // 查询页面和审批页面各角色可见范围
             // 如果是负责人，则只能看见自己部门的人员
             if(roleIds!=null && roleIds.size()!=0){
-                if("1".equals(roleIds.get(0).getRoleId())){
-                    param.put("staffId",staffId);
+                for(ApproveRoleVo vo:roleIds){
+                    if("1".equals(vo.getRoleId())){
+                        param.put("staffId",staffId);
+                        param.put("roleBmfzr",true);
+                    }else if("2".equals(vo.getRoleId())){
+                        param.put("roleZjl",true);
+                    }else if("3".equals(vo.getRoleId())){
+                        param.put("roleKj",true);
+                    }else if("4".equals(vo.getRoleId())){
+                        param.put("roleCwzj",true);
+                    }
+
                 }
             }
         }
@@ -133,18 +143,18 @@ public class ApproveRoleBiz extends BaseBiz<ApproveRoleMapper, ApproveRoleVo> {
         报销状态（ 1、已保存 2、已提交 3、已初审 4、已复审 5、驳回 6、已复核 7、已打款 ）
         角色-状态
         1-2，2-3，3-4，3-6 */
-        if("approve".equals(type)){
-            if("1".equals(roleIds.get(0).getRoleId())){
-                param.put("bxzt","2");
-            }else if("2".equals(roleIds.get(0).getRoleId())){
-                param.put("bxzt","3");
-            }else if("3".equals(roleIds.get(0).getRoleId())){
-                param.put("bxzt","4");
-            }else if("4".equals(roleIds.get(0).getRoleId())){
-                param.put("bxzt","6");
-            }
-
-        }
+//        if("approve".equals(type)){
+//            if("1".equals(roleIds.get(0).getRoleId())){
+//                param.put("bxzt","2");
+//            }else if("2".equals(roleIds.get(0).getRoleId())){
+//                param.put("bxzt","3");
+//            }else if("3".equals(roleIds.get(0).getRoleId())){
+//                param.put("bxzt","4");
+//            }else if("4".equals(roleIds.get(0).getRoleId())){
+//                param.put("bxzt","6");
+//            }
+//
+//        }
         String[] arr = { "1","2","3"};
         List<Integer> list = new ArrayList<>();
         for(String str:arr){
diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
index e20d638..337580f 100644
--- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
+++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
@@ -89,38 +89,62 @@
     <select id="count" resultType="java.lang.Integer">
         select
             count(1)
-        from t_wb_bxd b,
-        NeurayPM_Admin.admin_staff ast,
-        NeurayPM_Admin.admin_staff astt,
-        NeurayPM_Admin.Sys_Codelist bxlx,
-        NeurayPM_Admin.Sys_Codelist jsfs,
-        NeurayPM_Admin.Sys_Codelist bxzt
-        where b.bxlx = bxlx.code_value
-        and bxlx.name = 'BXLX'
-        and b.jsfs = jsfs.code_value
-        and jsfs.name = 'JSFS'
-        and b.bxzt = bxzt.code_value
-        and bxzt.name = 'BXZT'
-        and ast.id = b.STAFF_ID
-        and astt.id = b.STAFF_ID
-        <if test="staffId != null and staffId != ''">
-            and b.STAFF_ID
-            in (SELECT ast.ID
-            FROM T_WB_ROLE_USER_DEPT twrud,
-            NeurayPM_Admin.ADMIN_STAFF ast
-            WHERE twrud.DEPT_CODE = ast.DEPT_CODE
-            AND twrud.STAFF_ID = #{staffId}
-            )
-        </if>
-        <if test="userId != null and userId != ''">
-            and b.STAFF_ID = #{userId}
-        </if>
-        <if test="bxzt != null and bxzt != ''">
-            and b.bxzt = #{bxzt}
-        </if>
-        <if test="bxlx != null and bxlx != ''">
-            and b.bxlx = #{bxlx}
-        </if>
+        from  (
+            select
+                b.STAFF_ID,
+                b.bxzt,
+                b.bxlx
+            from t_wb_bxd b,
+            NeurayPM_Admin.admin_staff ast,
+            NeurayPM_Admin.admin_staff astt,
+            NeurayPM_Admin.Sys_Codelist bxlx,
+            NeurayPM_Admin.Sys_Codelist jsfs,
+            NeurayPM_Admin.Sys_Codelist bxzt
+            where b.bxlx = bxlx.code_value
+            and bxlx.name = 'BXLX'
+            and b.jsfs = jsfs.code_value
+            and jsfs.name = 'JSFS'
+            and b.bxzt = bxzt.code_value
+            and bxzt.name = 'BXZT'
+            and ast.id = b.STAFF_ID
+            and astt.id = b.STAFF_ID
+        ) aa
+        <where>
+            <if test="roleBmfzr == true">
+                or (
+                aa.bxlx = #{bxlx}
+                and aa.bxzt = '2'
+                <if test="staffId != null and staffId != ''">
+                    and aa.STAFF_ID
+                    in (SELECT ast.ID
+                    FROM T_WB_ROLE_USER_DEPT twrud,
+                    NeurayPM_Admin.ADMIN_STAFF ast
+                    WHERE twrud.DEPT_CODE = ast.DEPT_CODE
+                    AND twrud.STAFF_ID = #{staffId}
+                    )
+                </if>
+                )
+            </if>
+            <if test="roleZjl == true">
+                or(
+                aa.bxlx = #{bxlx}
+                and aa.bxzt = '3'
+                )
+            </if>
+            <if test="roleKj == true">
+                or(
+                    aa.bxlx = #{bxlx}
+                    and aa.bxzt = '4'
+                )
+            </if>
+            <if test="roleCwzj == true">
+                or(
+                    aa.bxlx = #{bxlx}
+                    and aa.bxzt = '6'
+                )
+            </if>
+        </where>
+
     </select>
 
 </mapper>
-- 
Gitee