wu 2 дней назад
Родитель
Сommit
8a8293147f

+ 2 - 1
src/custom/restcontroller/webmanage/sale/contracttask/EsignContractTask.java

@@ -102,9 +102,10 @@ public class EsignContractTask extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_esign_contract_template", "t2", "t1.sa_esign_contract_templateid=t2.sa_esign_contract_templateid",
                 "type", "templateid", "name");
         querySQL.setSiteid(siteid);
-        if (getDepartment(userid).getString("depname").equals("区域经理")) {
+        if (usertype==2) {
             querySQL.setWhere("t1.createuserid", userid);
         }
+        querySQL.setOrderBy("t1.createdate desc");
         querySQL.setCondition("t1.taskname","t1.remarks","t2.name");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();

+ 3 - 2
src/custom/restcontroller/webmanage/sale/contracttask/EsignContractTaskMX.java

@@ -102,7 +102,7 @@ public class EsignContractTaskMX extends Controller {
             querySQL.setWhere("t3.balance>0");
             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.status=1");
@@ -461,10 +461,11 @@ public class EsignContractTaskMX extends Controller {
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid",
                 "agentnum");
         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.setSiteid(siteid);
+        querySQL.setOrderBy("t1.createdate desc");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();