Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -284,7 +285,9 @@ public class WaterResourceController extends BaseController {
             WaterResourceIot waterResourceIot = waterResourceIotService.getOne(new QueryWrapper<WaterResourceIot>().eq(
                     "resource_id", sequenceNbr));
             WaterResourceIotDto waterResourceIotDto = new WaterResourceIotDto();
-            BeanUtils.copyProperties(waterResourceIot, waterResourceIotDto);
+            if (!ValidationUtil.isEmpty(waterResourceIot)) {
+                BeanUtils.copyProperties(waterResourceIot, waterResourceIotDto);
+            }
             waterResourceDto.setWaterResourceIotDto(waterResourceIotDto);
         }
         return ResponseHelper.buildResponse(waterResourceDto);

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -18,5 +18,6 @@
   	<module>amos-boot-module-jcs-biz</module>
     <!--<module>amos-boot-module-demo-biz</module>-->
     <module>amos-boot-module-common-biz</module>
+    <module>amos-boot-module-command-biz</module>
   </modules>
 </project>
\ No newline at end of file