ariesy 已认证的数据认证证人为空时,设置成damin

release
yefei 2 years ago
parent 56b2a9ff5e
commit 57b1c2b5c8
  1. 12
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 14
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@ -186,10 +186,14 @@ public class BaseInvoiceController extends AbstractController {
pramsMap.put("xfmc", xfmc); pramsMap.put("xfmc", xfmc);
pramsMap.put("qsr", qsr); pramsMap.put("qsr", qsr);
if (StringUtils.isNotBlank(rzhr)) { if (StringUtils.isNotBlank(rzhr)) {
String[] split = rzhr.split(","); if("admin".equals(rzhr)){
if (!Arrays.asList(split).contains("")) { pramsMap.put("rzhr", rzhr);
String[] split1 = rzhr.split(","); }else {
pramsMap.put("rzhr", Arrays.asList(split1)); String[] split = rzhr.split(",");
if (!Arrays.asList(split).contains("")) {
String[] split1 = rzhr.split(",");
pramsMap.put("rzhr", Arrays.asList(split1));
}
} }
} }

@ -156,11 +156,7 @@
and t.qs_name = #{qsr} and t.qs_name = #{qsr}
</if> </if>
<if test="rzhr == 'admin'"> <if test="rzhr == 'admin'">
and (t.confirm_user in and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
<foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
or t.confirm_user is null or t.confirm_user = '')
</if> </if>
<if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'"> <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
and t.confirm_user in and t.confirm_user in
@ -440,12 +436,8 @@
<if test="qsr != null and qsr != '' and qsr != 'null' "> <if test="qsr != null and qsr != '' and qsr != 'null' ">
and t.qs_name = #{qsr} and t.qs_name = #{qsr}
</if> </if>
<if test="rzhr == '[admin]'"> <if test="rzhr == 'admin'">
and (t.confirm_user in and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
<foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
or t.confirm_user is null or t.confirm_user = '')
</if> </if>
<if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'"> <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
and t.confirm_user in and t.confirm_user in

Loading…
Cancel
Save