소스 검색

modify transfor staff machines bug

java110 3 년 전
부모
커밋
20790deb9a

+ 1 - 1
service-job/src/main/java/com/java110/job/adapt/hcIot/staff/AddStaffToIotAdapt.java

@@ -153,7 +153,7 @@ public class AddStaffToIotAdapt extends DatabusAdaptImpl {
                 storeUserObj.put("staffName", tmpOrgStaffRelDto.getStaffName());
                 storeUserObj.put("departmentId", tmpOrgStaffRelDto.getOrgId());
                 storeUserObj.put("departmentName", tmpOrgStaffRelDto.getOrgName());
-                if (machineDtos != null && machineDtos.size() < 1) {
+                if (machineDtos != null && machineDtos.size() > 0) {
                     storeUserObj.put("machineCode", machineDtos.get(0).getMachineCode());
                     storeUserObj.put("extMachineId", machineDtos.get(0).getMachineId());
                     storeUserObj.put("extCommunityId", machineDtos.get(0).getCommunityId());

+ 4 - 0
service-store/src/main/java/com/java110/store/cmd/assetInventory/ListAssetInventoryCmd.java

@@ -22,6 +22,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.assetInventory.AssetInventoryDto;
 import com.java110.intf.store.IAssetInventoryV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
@@ -52,6 +53,8 @@ public class ListAssetInventoryCmd extends Cmd {
     @Autowired
     private IAssetInventoryV1InnerServiceSMO assetInventoryV1InnerServiceSMOImpl;
 
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -66,6 +69,7 @@ public class ListAssetInventoryCmd extends Cmd {
 
            List<AssetInventoryDto> assetInventoryDtos = null;
 
+
            if (count > 0) {
                assetInventoryDtos = assetInventoryV1InnerServiceSMOImpl.queryAssetInventorys(assetInventoryDto);
            } else {

+ 1 - 1
service-user/src/main/java/com/java110/user/cmd/buildingOwner/SaveBuildingOwnerCmd.java

@@ -35,7 +35,7 @@ import com.java110.core.log.LoggerFactory;
 /**
  * 类表述:保存
  * 服务编码:buildingOwner.saveBuildingOwner
- * 请求路劲:/app/buildingOwner.SaveBuildingOwner
+ * 请求路劲:http://ip:port/app/buildingOwner.saveBuildingOwner
  * add by 吴学文 at 2021-10-08 17:43:55 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn