java110 лет назад: 3
Родитель
Сommit
4e12aa79fa

+ 1 - 1
service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java

@@ -112,7 +112,7 @@ public class UpdateMachineCmd extends Cmd {
         }
 
         JSONArray attrs = reqJson.getJSONArray("attrs");
-        if (attrs.size() < 1) {
+        if (attrs == null || attrs.size() < 1) {
             return;
         }
 

+ 1 - 1
service-community/src/main/java/com/java110/community/cmd/community/UpdateCommunityCmd.java

@@ -116,7 +116,7 @@ public class UpdateCommunityCmd extends Cmd {
         }
 
         JSONArray attrs = reqJson.getJSONArray("attrs");
-        if (attrs.size() < 1) {
+        if (attrs == null || attrs.size() < 1) {
             return;
         }
 

+ 1 - 1
service-community/src/main/java/com/java110/community/cmd/parkingArea/UpdateParkingAreaCmd.java

@@ -53,7 +53,7 @@ public class UpdateParkingAreaCmd extends Cmd {
         }
 
         JSONArray attrs = reqJson.getJSONArray("attrs");
-        if (attrs.size() < 1) {
+        if (attrs == null || attrs.size() < 1) {
             return;
         }
 

+ 1 - 1
service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java

@@ -156,7 +156,7 @@ public class UpdateRoomCmd extends Cmd {
             return;
         }
         JSONArray attrs = reqJson.getJSONArray("attrs");
-        if (attrs.size() < 1) {
+        if (attrs == null || attrs.size() < 1) {
             return;
         }
         JSONObject attr = null;

+ 3 - 3
service-store/src/main/java/com/java110/store/cmd/scheduleClasses/UpdateScheduleClassesCmd.java

@@ -112,7 +112,7 @@ public class UpdateScheduleClassesCmd extends Cmd {
         ScheduleClassesDayDto scheduleClassesDayDto = new ScheduleClassesDayDto();
         scheduleClassesDayDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
         List<ScheduleClassesDayDto> scheduleClassesDayDtos = scheduleClassesDayV1InnerServiceSMOImpl.queryScheduleClassesDays(scheduleClassesDayDto);
-        if (scheduleClassesDayDtos != null && scheduleClassesDayDtos.size() == 1) {
+        if (scheduleClassesDayDtos != null && scheduleClassesDayDtos.size() > 0) {
             ScheduleClassesDayPo scheduleClassesDayPo = new ScheduleClassesDayPo();
             scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
             flag = scheduleClassesDayV1InnerServiceSMOImpl.deleteScheduleClassesDay(scheduleClassesDayPo);
@@ -122,9 +122,9 @@ public class UpdateScheduleClassesCmd extends Cmd {
         }
         ScheduleClassesTimeDto scheduleClassesTimeDto = new ScheduleClassesTimeDto();
         scheduleClassesTimeDto.setScheduleId(scheduleClassesDtos.get(0).getScheduleId());
-        scheduleClassesTimeDto.setDayId(scheduleClassesDayDtos.get(0).getDayId());
+        //scheduleClassesTimeDto.setDayId(scheduleClassesDayDtos.get(0).getDayId());
         List<ScheduleClassesTimeDto> scheduleClassesTimeDtos = scheduleClassesTimeV1InnerServiceSMOImpl.queryScheduleClassesTimes(scheduleClassesTimeDto);
-        if (scheduleClassesTimeDtos != null && scheduleClassesTimeDtos.size() == 1) {
+        if (scheduleClassesTimeDtos != null && scheduleClassesTimeDtos.size() >0) {
             ScheduleClassesTimePo scheduleClassesTimePo = new ScheduleClassesTimePo();
             scheduleClassesTimePo.setScheduleId(scheduleClassesPo.getScheduleId());
             flag = scheduleClassesTimeV1InnerServiceSMOImpl.deleteScheduleClassesTime(scheduleClassesTimePo);

+ 2 - 2
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -194,7 +194,7 @@ public class EditOwnerCmd extends Cmd {
         }
         editOwner(reqJson);
         JSONArray attrs = reqJson.getJSONArray("attrs");
-        if (attrs.size() < 1) {
+        if (attrs == null && attrs.size() < 1) {
             return;
         }
         JSONObject attr = null;
@@ -203,7 +203,7 @@ public class EditOwnerCmd extends Cmd {
             attr = attrs.getJSONObject(attrIndex);
             attr.put("memberId", reqJson.getString("memberId"));
             attr.put("communityId", reqJson.getString("communityId"));
-            if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
+            if (!attr.containsKey("attrId") || StringUtil.isEmpty(attr.getString("attrId")) || attr.getString("attrId").startsWith("-")) {
                 attr.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
                 OwnerAttrPo ownerAttrPo = BeanConvertUtil.covertBean(attr, OwnerAttrPo.class);
                 flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);