团队人员信息bug修复

src/custom/restcontroller/ClientUserInfo.java

@@ -1,5 +1,7 @@
 package restcontroller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.UserInfo;
 import common.YosException;
@@ -130,5 +132,23 @@ public class ClientUserInfo extends UserInfo {
         return rows.isEmpty() ? -1 : rows.get(0).getLong("userid");
     }
 
+    //获取微信操作端信息
+    public String getWechatAppPage(String systemclient,String name) throws YosException {
+        String path = "";
+        Rows rows = controller.dbConnect.runSqlQuery("SELECT * from sys_wechatapp  WHERE systemclient='" + systemclient + "'");
+        if (rows.isEmpty()) {
+            return "";
+        }
+        JSONArray jsonArray = rows.get(0).getJSONArray("pages");
+
+        for (Object object : jsonArray) {
+            JSONObject jsonObject = (JSONObject) object;
+            if (jsonObject.getString("name").equals(name)) {
+                path = jsonObject.getStringValue("path");
+            }
+        }
+        return path;
+    }
+
 
 }

src/custom/restcontroller/webmanage/saletool/sharematerial/Renderings.java

@@ -103,7 +103,7 @@ public class Renderings extends Controller {
         attRows.sortby("sequence", "linksid");
         detailRow.put("attinfos", attRows);
         detailRow.putIfAbsent("checkdate", "");
-        detailRow.put("appleturl", Parameter.get("CaseImgsUrl") + sat_sharematerialid);
+        detailRow.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + sat_sharematerialid);
         if (StringUtils.isBlank(detailRow.getString("panoramaurl"))) {
             detailRow.put("ispanorama", 0);
         } else {
@@ -252,7 +252,7 @@ public class Renderings extends Controller {
             } else {
                 row.put("ispanorama", 1);
             }
-            row.put("appleturl", Parameter.get("CaseImgsUrl") + row.getString("sat_sharematerialid"));
+            row.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + row.getString("sat_sharematerialid"));
         }
 
 
@@ -424,7 +424,7 @@ public class Renderings extends Controller {
 
         for (Row row : rows) {
             if (type == 1) {
-                row.put("appleturl", FadHelper.getAppletUrl(this, "CaseImgsUrl", "效果图小程序链接") + row.getString("sat_sharematerialid"));
+                row.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + row.getString("sat_sharematerialid"));
                 Rows Rows = rowsMap.getOrDefault(row.getString("sat_sharematerialid"), new Rows());
                 row.put("attinfos", Rows);
             }

src/custom/restcontroller/webmanage/saletool/store/StoreTeam.java

@@ -160,7 +160,7 @@ public class StoreTeam extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sys_enterprise_hr"
                         , "sys_enterprise_hrid", "name", "position", "phonenumber", "isleader", "userid", "createby", "createdate", "changeby", "changedate")
                 .setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sa_store_hr", "t2", "t2.sys_enterprise_hrid=t1.sys_enterprise_hrid and t2.siteid=t1.siteid"
+        querySQL.addJoinTable(JOINTYPE.left, "sa_store_hr", "t2", "t2.sys_enterprise_hrid=t1.sys_enterprise_hrid and t2.siteid=t1.siteid"
                 , "sa_store_hrid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t3", "t3.userid=t1.userid "
                 , "accountno");