Browse Source

综合查询

lizeyu 7 months ago
parent
commit
7f262d75c2

+ 3 - 3
src/main/java/com/ghsc/partybuild/service/impl/PartyUserServiceImpl.java

@@ -560,12 +560,12 @@ public class PartyUserServiceImpl implements PartyUserService {
 
         PageHelper.startPage(pageNum, pageSize);
 
-        boolean isLead = true;
+        /*boolean isLead = true;
         //包括领导人信息为空就不是相对接口
         if (curUserId != null) {
             isLead = appConfig.leadUids.contains(curUserId);
-        }
-        List<HashMap<String, Object>> list = partyUserCquery.selectPartyUserListForSearch(dzzdm, dzzmc, xm, csrq_begin, csrq_end, rdsj_begin, rdsj_end, zzsj_begin, zzsj_end, jg, dnzw, xzzw, jszw, xl, xb, gwzt, zzmm, mz, pxpy_year, pxpy_level, pxpy_type, sfzyxq, isLead, age_begin, age_end);
+        }*/
+        List<HashMap<String, Object>> list = partyUserCquery.selectPartyUserListForSearch(dzzdm, dzzmc, xm, csrq_begin, csrq_end, rdsj_begin, rdsj_end, zzsj_begin, zzsj_end, jg, dnzw, xzzw, jszw, xl, xb, gwzt, zzmm, mz, pxpy_year, pxpy_level, pxpy_type, sfzyxq, null, age_begin, age_end);
         PageInfo<HashMap<String, Object>> result = new PageInfo(list);
         return result;
 

+ 3 - 3
src/main/resources/mapping/PartyUserCQuery.xml

@@ -618,9 +618,9 @@
             </if>
             )
         </if>
-        <if test="!islead">
-            and usfb.leadtype != 1
-        </if>
+<!--        <if test="!islead">-->
+<!--            and usfb.leadtype != 1-->
+<!--        </if>-->
         <if test="sfzyxq != null">
             <if test="sfzyxq == 1">
                 and jlcf.USERID is not null