From 01e2c982dec2a55fb8666f8cc801dd1540fa62cd Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 21 八月 2023 11:02:01 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0
---
src/main/java/com/product/mobile/core/service/ContanctOrgListService.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java b/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
index db8c836..39c2c8f 100644
--- a/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
+++ b/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
@@ -29,7 +29,7 @@
@Component
public class ContanctOrgListService extends AbstractBaseService{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //鍒跺畾杈撳嚭鏍煎紡
-
+
@Autowired
public BaseDao baseDao;
/**
@@ -42,23 +42,48 @@
public DataTableEntity orgList(FieldSetEntity fse) throws BaseException{
SystemUser user=SpringMVCContextHolder.getCurrentUser();
boolean all=Global.getPropertyToBoolean("mobile.contanct.org.all", "false").booleanValue();
+ boolean delay=Global.getPropertyToBoolean("mobile.contanct.org.delay", "false").booleanValue();
+
String code=user.getCurrentCompany().getString("org_level_code");
//鍏徃閮ㄩ棬
StringBuilder b=new StringBuilder();
b.append("select uuid,org_level_name name, org_level_type,org_level_code code,org_level_code_parent,org_level_type type from product_sys_org_levels where org_level_status=0 ");
- if(all) {b.append(" and org_level_code like '").append(code).append("%'");}//鍙姞杞藉叕鍙�
- b.append(" order by org_level_code");
+ if(!all) {b.append(" and org_level_code like '").append(code).append("%'");}//鍙姞杞藉叕鍙�
+ b.append(" order by LENGTH(org_level_code) ,org_level_type");
DataTableEntity org=baseDao.listTable(b.toString(), new String[] {});
//鍛樺伐
b=new StringBuilder();
b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
- if(all) {b.append(" and a.tricode like '").append(code).append("%'");}//鍙姞杞藉叕鍙镐汉鍛�
-// b.append(" order by a.org_level_code");
+
+ if(delay) {//寤惰繜鍥炶浇锛屽彧鍔犺浇褰撳墠浜烘墍鍦ㄩ儴闂ㄧ殑浜哄憳
+ b.append(" and a.tricode like '").append(user.getCurrentDept().getString("org_level_code")).append("%'");
+ }else if(!all) {
+ b.append(" and a.tricode like '").append(code).append("%'");
+ }//鍙姞杞藉叕鍙镐汉鍛�
+ b.append(" order by CONVERT(a.show_name USING gbk) COLLATE gbk_chinese_ci ASC");
DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});
-
+
return parseData(org,staff);
}
-
+ /**
+ * 鍏堟煡鍑哄巻鍙叉墦鍗¤褰�
+ * @param cpage
+ * @param pagesize
+ * @return
+ * @throws BaseException
+ */
+ public DataTableEntity orgList(String orgCode) throws BaseException{
+ SystemUser user=SpringMVCContextHolder.getCurrentUser();
+ if(StringUtils.isEmpty(orgCode) || orgCode.equals(user.getCurrentDept().getString("tricode") ) ) {//褰撳墠浜洪儴闂紝涔熶笉鐢ㄤ紶
+ return new DataTableEntity();
+ }
+ //鍛樺伐
+ StringBuilder b=new StringBuilder();
+ b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
+ b.append(" and a.tricode = '").append(orgCode).append("'");
+ DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});
+ return staff;
+ }
/**
* 瀵规暟鎹繘琛屽皝瑁�
* @param dt
@@ -110,9 +135,9 @@
sub.addFieldSetEntity(f);
}
}
-
+
}
-
+
return pdt;
}
}
--
Gitblit v1.9.2