diff --git a/huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java b/huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java index fa5c459..dcb3ffd 100644 --- a/huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java +++ b/huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java @@ -201,6 +201,8 @@ public class CommonUtils { String[] oradmin={"市本级"}; projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place)); projectInfoAuthSelect.setAndadminDivision(Arrays.asList(oradmin)); + String[] noDutyPlace ={""}; + projectInfoAuthSelect.setNotorDutyPlace(Arrays.asList(noDutyPlace)); }else if(currentUser.getNickname().equals("唐磊")){ String[] place ={"湖州市中医院","湖州市第三人民医院"}; String[] admin={"长兴县","德清县"}; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml index 4896893..334da1b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml @@ -168,7 +168,10 @@ #{id} - or e.duty_workplace =#{info.orDutyPlace} + or e.duty_workplace in + + #{id} + and u.duty_workplace not in @@ -227,6 +230,7 @@ +