Merge branch 'master' of https://github.com/java110/MicroCommunity

docs/operateDoc/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](favicon.ico)
 
-# HC小区管理系统操作手册<small>0.2稳定版</small>
+# HC小区管理系统操作手册
 
 > hc小区管理系统是为物业企业打造的智慧物业综合管理平台.
 

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -505,7 +505,12 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             paramIn.put("ownerTypeCd", "1001");
             paramIn.put("idCard", owner.getIdCard());
             responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+
             if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+                if(body.containsKey("code") && body.getIntValue("code") != 0){
+                    throw new IllegalArgumentException(body.getString("msg"));
+                }
                 savedOwnerInfo = getExistsOwner(pd, result, owner);
                 owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
             }
@@ -771,7 +776,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             importRoom.setSection(os[4].toString());
             importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
 
-            if (!StringUtil.isEmpty(os[6].toString())) {
+            if (!StringUtil.isNullOrNone(os[6])) {
                 importRoom.setRoomFeeId(os[7].toString());
                 importRoom.setFeeEndDate(os[8].toString());
             }

service-user/src/main/java/com/java110/user/listener/SaveUserInfoListener.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.entity.center.Business;
-import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
 import com.java110.po.user.UserPo;
 import com.java110.user.dao.IUserServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
@@ -57,7 +57,7 @@ public class SaveUserInfoListener extends AbstractBusinessServiceDataFlowListene
 
         Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
 
-        Assert.jsonObjectHaveKey(data, UserPo.class.getSimpleName(), "datas 节点下没有包含 businessUser 节点");
+        Assert.jsonObjectHaveKey(data, UserPo.class.getSimpleName(), "datas 节点下没有包含 businessUser 节点" + data);
 
         //这里先支持 jsonObject 后期再改造
         JSONObject businessUser = data.getJSONArray(UserPo.class.getSimpleName()).getJSONObject(0);