Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -23,7 +23,8 @@ public enum ProcDefEnum {
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
-    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
+//    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:7:840004"),//ToDo:测试
 //    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -238,7 +238,7 @@
                  left join sys_staffinfo si on si.sid = su.staffSid
                  left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) and si.personTypeKey != '01'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
@@ -276,7 +276,7 @@
         from sys_user_role sr
                  left join sys_user su on sr.userSid = su.sid
                  left join sys_staffinfo si on si.sid = su.staffSid
-        where sr.roleSid = #{roleSid}
+        where sr.roleSid = #{roleSid} and si.personTypeKey != '01'
     </select>
 
     <update id="updateAppIdByMobile">