提交

src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java

@@ -130,6 +130,15 @@ public class TdBuildingTypeController extends BaseController {
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
+            if (count != null && count > 0) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
@@ -186,6 +195,16 @@ public class TdBuildingTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
 
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
+
             // 如果是删除，状态为 -1
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -56,7 +56,7 @@
             and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
         </if>
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
-            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
         order by t.create_date desc
     </select>