Przeglądaj źródła

优化查询地区bug

wuxw 6 lat temu
rodzic
commit
6c389e5873

+ 2 - 1
WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java

@@ -141,8 +141,9 @@ public class CompanyServiceSMOImpl extends BaseComponentSMO implements ICompanyS
     public ResponseEntity<String> getAreas(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
         Assert.hasLength(pd.getUserId(), "用户还未登录请先登录");
+        JSONObject param = JSONObject.parseObject(pd.getReqData());
 
-        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/area.listAreas", HttpMethod.GET);
+        responseEntity = this.callCenterService(restTemplate, pd, mapToUrlParam(param), ServiceConstant.SERVICE_API_URL + "/api/area.listAreas", HttpMethod.GET);
 
         if (responseEntity.getStatusCode() == HttpStatus.OK) {
             Assert.jsonObjectHaveKey(responseEntity.getBody(), "areas", "查询中心服务异常,不是有效json或未包含areas节点");

+ 1 - 1
WebService/src/main/resources/components/orgPackage/add-org/addOrg.js

@@ -209,7 +209,7 @@
                     param,
                     function (json, res) {
                         var _enterCommunitys = JSON.parse(json);
-                        vc.component.addOrgInfo.belongCommunitys = _enterCommunitys.communitys;
+                        vc.component.addOrgInfo.belongCommunitys = _enterCommunitys;
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }

+ 3 - 0
WebService/src/main/resources/components/orgPackage/org-manage/orgManage.js

@@ -67,6 +67,9 @@
             vc.on('orgManage', 'listOrg', function (_param) {
                 //vc.copyObject(_param, vc.component.orgManageInfo.conditions);
                 vc.component._listOrgs(DEFAULT_PAGE, DEFAULT_ROWS);
+                vc.component._listOrgTrees(vc.component.orgManageInfo.orgTree, '1', '', function () {
+                    vc.component._loadBranchOrgTrees();
+                });
             });
             vc.on('pagination', 'page_event', function (_currentPage) {
                 vc.component._listOrgs(_currentPage, DEFAULT_ROWS);

+ 1 - 1
java110-front/src/main/resources/static/js/vc-validate.js

@@ -98,7 +98,7 @@ vc 校验 工具类 -method
          * @param {校验文本} text
          */
         num:function(text){
-            var regNum = /^[1-9][0-9]*$/;
+            var regNum = /^[0-9][0-9]*$/;
             return regNum.test(text);
         },
         date:function(str) {