排除null

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireStationServiceImpl.java

@@ -16,72 +16,82 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
 import java.util.Map;
+
 /**
-* 微型消防站服务实现类
-*
-* @author system_generator
-* @date 2021-06-28
-*/
+ * 微型消防站服务实现类
+ *
+ * @author system_generator
+ * @date 2021-06-28
+ */
 @Service
-public class FireStationServiceImpl extends BaseService<FireStationDto,FireStation,FireStationMapper> implements IFireStationService {
-	
-	 @Autowired
-	 FireStationMapper fireStationMapper;
-	 @Autowired
-	 OrgUsrMapper  orgUsrMapper;
-        /**
-         * 分页查询
-         */
-        public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+public class FireStationServiceImpl extends BaseService<FireStationDto, FireStation, FireStationMapper>
+		implements IFireStationService {
+
+	@Autowired
+	FireStationMapper fireStationMapper;
+	@Autowired
+	OrgUsrMapper orgUsrMapper;
+
+	/**
+	 * 分页查询
+	 */
+	public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
+		return this.queryForPage(page, null, false);
+	}
+
+	/**
+	 * 列表查询 示例
+	 */
+	public List<FireStationDto> queryForFireStationList() {
+		return this.queryForList("", false);
+	}
 
-        /**
-         * 列表查询 示例
-         */
-        public List<FireStationDto> queryForFireStationList()   {
-                return this.queryForList("" , false);
-        }
-        /**
-         * 删除
-         * */
-        public Boolean updateisDelete( Long sequenceNbr)   {
-        	
-        	return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
-       }
+	/**
+	 * 删除
+	 */
+	public Boolean updateisDelete(Long sequenceNbr) {
 
-		@Override
-		public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {			
-		    List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
-		    Map<String, Long> num = fireStationMapper.getFireStationCount( par);
-		    Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
-		    return   pageBean.setRecords(list);
+		return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));
+	}
+
+	@Override
+	public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {
+		List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
+		Map<String, Long> num = fireStationMapper.getFireStationCount(par);
+		Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+		return pageBean.setRecords(list);
+	}
+
+	/**
+	 * 
+	 * 新增
+	 * 
+	 ***/
+	public FireStationDto add(FireStationDto model) {
+
+		if (model.getBizCompanyId() != null) {
+			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
+			model.setBizCompany(orgUsr.getBizOrgName());
+			model.setBizCompanyCode(orgUsr.getBizOrgCode());
 		}
+		FireStation entity = this.prepareEntity(model);
+		this.save(entity);
+		return Bean.toModel(entity, model);
+	}
 
-		/**
-		 * 
-		 * 新增
-		 * 
-		 * ***/
-		 public FireStationDto add(FireStationDto model) {
-			     OrgUsr orgUsr=orgUsrMapper.selectById(model.getBizCompanyId());
-			    model.setBizCompany(orgUsr.getBizOrgName());
-			    model.setBizCompanyCode(orgUsr.getBizOrgCode());
-			    FireStation entity = this.prepareEntity(model);	
-		        this.save(entity);
-		        return Bean.toModel(entity, model);
-		    }
-		/**
-		 * 
-		 * 修改
-		 * 
-		 * ***/
-		 public FireStationDto Update(FireStationDto model) {
-			    OrgUsr orgUsr=orgUsrMapper.selectById(model.getBizCompanyId());
-			    model.setBizCompany(orgUsr.getBizOrgName());
-			    model.setBizCompanyCode(orgUsr.getBizOrgCode());
-			    FireStation entity = this.prepareEntity(model);			    
-		        this.updateById(entity);
-		        return Bean.toModel(entity, model);
-		    }
+	/**
+	 * 
+	 * 修改
+	 * 
+	 ***/
+	public FireStationDto Update(FireStationDto model) {
+		if (model.getBizCompanyId() != null) {
+			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
+			model.setBizCompany(orgUsr.getBizOrgName());
+			model.setBizCompanyCode(orgUsr.getBizOrgCode());
+		}
+		FireStation entity = this.prepareEntity(model);
+		this.updateById(entity);
+		return Bean.toModel(entity, model);
+	}
 }