1.组织机构叶子节点延伸

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0800.java

@@ -11,6 +11,7 @@ import com.baosight.iplat4j.ef.ui.tree.TreeService;
 import com.baosight.xservices.xs.service.ServiceXSTreeNode;
 import com.baosight.xservices.xs.util.LoginUserDetails;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,11 +66,14 @@ public class ServiceXSOG0800 extends TreeService {
 		}
 		
 		List result = (List)parentOrgMap.get(parentLabel);
-		
+		if(CollectionUtils.isEmpty(result)){
+			return result;
+		}
 		for(int i = 0; i < result.size(); ++i) {
 			orgId = (String)((Map)result.get(i)).get("label");
 			String hasChild = parentOrgMap.get(orgId) != null ? "2" : "1";
-			((Map)result.get(i)).put("leaf", hasChild);
+//			((Map)result.get(i)).put("leaf", hasChild);
+			((Map)result.get(i)).put("leaf", "0");
 		}
 		
 		return result;

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801.java

@@ -91,6 +91,10 @@ public class ServiceXSOG0801 extends ServiceBase {
 			hashMap.put("orgEname", inInfo.get("inqu_status-0-orgEname"));
 			hashMap.put("loginName", inInfo.get("inqu_status-0-loginName"));
 			hashMap.put("userName", inInfo.get("inqu_status-0-userName"));
+			// 非管理员仅查询所属企业用户 added by songx at 2024-01-16
+			if (!LoginUserDetails.isUserAdmin(UserSessionUtils.getLoginName())) {
+				hashMap.put("companyCode", UserSessionUtils.getCompanyCode());
+			}
 			List<Map<String, Object>> totalUser = this.dao.query("XSOG0801.queryUserByOrgIdBack", hashMap);
 			List<Map<String, Object>> userList = new ArrayList();
 			List<String> userIdList = new ArrayList();

src/main/java/com/baosight/xservices/xs/og/sql/XSOG0801.xml

@@ -142,6 +142,9 @@
         INNER JOIN ${platSchema}.xs_user xu ON t2.USER_ID = xu.USER_ID
         WHERE
         xu.LOGIN_NAME != 'admin'
+        <isNotEmpty prepend="AND" property="companyCode">
+            t1.COMPANY_CODE = #companyCode#
+        </isNotEmpty>
         <isNotEmpty prepend="AND" property="orgCname">
             t1.ORG_CNAME LIKE ('%$orgCname$%')
         </isNotEmpty>