|
@@ -102,7 +102,7 @@ public class EsignContractTaskMX extends Controller {
|
|
|
querySQL.setWhere("t3.balance>0");
|
|
querySQL.setWhere("t3.balance>0");
|
|
|
querySQL.setWhere("t4.accountno='02'");
|
|
querySQL.setWhere("t4.accountno='02'");
|
|
|
}
|
|
}
|
|
|
- if (getDepartment(userid).getString("depname").equals("区域经理")) {
|
|
|
|
|
|
|
+ if (usertype==2) {
|
|
|
querySQL.setWhere("t1.sys_enterpriseid in (SELECT sys_enterpriseid FROM sys_enterprise_tradefield WHERE hrid=" + hrid + ")");
|
|
querySQL.setWhere("t1.sys_enterpriseid in (SELECT sys_enterpriseid FROM sys_enterprise_tradefield WHERE hrid=" + hrid + ")");
|
|
|
}
|
|
}
|
|
|
querySQL.setWhere("t1.status=1");
|
|
querySQL.setWhere("t1.status=1");
|
|
@@ -461,10 +461,11 @@ public class EsignContractTaskMX extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid",
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid",
|
|
|
"agentnum");
|
|
"agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid", "enterprisename", "abbreviation");
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid", "enterprisename", "abbreviation");
|
|
|
- if (getDepartment(userid).getString("depname").equals("区域经理")) {
|
|
|
|
|
|
|
+ if (usertype==2) {
|
|
|
querySQL.setWhere(" exists(select 1 from sys_enterprise_tradefield where sa_agentsid=t1.sa_agentsid and hrid=" + hrid + " )");
|
|
querySQL.setWhere(" exists(select 1 from sys_enterprise_tradefield where sa_agentsid=t1.sa_agentsid and hrid=" + hrid + " )");
|
|
|
}
|
|
}
|
|
|
querySQL.setSiteid(siteid);
|
|
querySQL.setSiteid(siteid);
|
|
|
|
|
+ querySQL.setOrderBy("t1.createdate desc");
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
|
Rows rows = querySQL.query();
|
|
Rows rows = querySQL.query();
|
|
|
|
|
|