Merge remote-tracking branch 'Gogs/develop' into develop

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -142,11 +142,13 @@ public class HyWorkOrder extends Controller {
 					/** 묏데뚤壇륩蛟데 **/
 					PaoSetRemote afterserviceorders = workorderpao.getPaoSet("AFTERSERVICEORDER");
 					if (!afterserviceorders.isEmpty()) {
-						Row row = new Row();
-						row.put("fsaler", afterserviceorders.getPao(0).getString("fsaler"));
-						row.put("fsalername", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("DISPLAYNAME"));
-						row.put("fsalerphone", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("PRIMARYPHONE"));					
-						rows_saler.add(row);
+						if (!StringUtils.isBlank(afterserviceorders.getPao(0).getString("fsaler"))) {
+							Row row = new Row();
+							row.put("fsaler", afterserviceorders.getPao(0).getString("fsaler"));
+							row.put("fsalername", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("DISPLAYNAME"));
+							row.put("fsalerphone", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("PRIMARYPHONE"));					
+							rows_saler.add(row);
+						}
 					}
 					row_detail.put("saler", rows_saler);
 					/** 묏데考뚠꿴璂 **/

src/rest/openapi/restcontroller/wechatapp/tsaler/SQL/经销商信息查询.sql

@@ -47,4 +47,4 @@ FROM tagents t1
 left join tagents t2 on t1.fupagentnum=t2.fagentnum and t1.siteid=t2.siteid
 where t1.siteid =$siteid$
   and exists (select fagentnum from tagents_field where hrid in $hrid$ and siteid=t1.siteid and fagentnum=t1.fagentnum )
-  and $where$
+  and t1.fisused=1 and $where$