访客设置加入停车场功能

java110-db/src/main/resources/mapper/community/VisitSettingV1ServiceDaoImplMapper.xml

@@ -19,7 +19,7 @@
     <select id="getVisitSettingInfo" parameterType="Map" resultType="Map">
         select t.car_num_way,t.car_num_way carNumWay,t.face_way,t.face_way faceWay,t.type_name,t.type_name
         typeName,t.audit_way,t.audit_way auditWay,t.remark,t.status_cd,t.status_cd
-        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name,
+        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
         flowName,t.setting_id,t.setting_id settingId,t.pa_id paId, t.pa_num paNum
         from visit_setting t
         where 1 =1

service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java

@@ -35,6 +35,7 @@ import com.java110.po.visitSetting.VisitSettingPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
@@ -107,17 +108,21 @@ public class SaveVisitSettingCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
-        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
-        parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
-        parkingAreaDto.setPaId(reqJson.getString("paId"));
-        List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
-        Assert.listOnlyOne(parkingAreaDtos,"停车场不存在");
+
 
         VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
         visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
         visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());
-        visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
+
+        if(!StringUtil.isEmpty(visitSettingPo.getPaId())) {
+            ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+            parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
+            parkingAreaDto.setPaId(reqJson.getString("paId"));
+            List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+            Assert.listOnlyOne(parkingAreaDtos, "停车场不存在");
+            visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
+        }
         flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
 
         if (flag < 1) {