修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -44,6 +44,11 @@ public class FireSourceController extends BaseController {
         fireEquipment.setCreateBy(getUserId());
         fireEquipment.setCreateDate(new Date());
         fireEquipment.setOrgCode(compCode);
+        
+        //设备状态默认为正常
+        fireEquipment.setEquipStatus(0);
+        
+        
         return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireStationController.java

@@ -141,7 +141,7 @@ public class FireStationController extends BaseController {
 			throw new Exception("数据校验失败.");
 		ReginParams reginParams =getSelectedOrgInfo();
 		String compCode=getOrgCode(reginParams);
-		fireStation.setCreateBy("0");
+		fireStation.setCreateBy(getUserId());
 		fireStation.setCreateDate(new Date());
 		fireStation.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireStationService.saveAndUpd(fireStation, file));

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_common.xml

@@ -7,7 +7,7 @@
 			count(p.id)
 		FROM
 			p_point p
-		where  1=1
+		where   p.is_delete='0'
 			<if test="orgCode!=null"> and p.org_code = #{orgCode} </if>
 			<if test="departmentId!=null"> and p.charge_dept_id = #{departmentId} </if>
 			<if test="pointNo!=null"> and p.point_no like concat(concat("%",#{pointNo}),"%") </if>
@@ -26,7 +26,7 @@
 			p.point_no pointNo
 		FROM
 			p_point p
-		where  1=1
+		where    p.is_delete='0'
 			<if test="orgCode!=null"> and p.org_code = #{orgCode} </if>
 			<if test="departmentId!=null"> and p.charge_dept_id = #{departmentId} </if>
 			<if test="pointNo!=null"> and p.point_no like concat(concat("%",#{pointNo}),"%") </if>