Merge branch 'master-bacground-im' into dev

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java

@@ -106,7 +106,7 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
         if (imQuestion == null || imQuestion.getId() == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        ImQuestion oldValue = mapper.selectOne(imQuestion);
+        ImQuestion oldValue = mapper.selectByPrimaryKey(imQuestion.getId());
         if (oldValue == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.IM_MSG_NOT_EXIST_CODE, ResultCode.getMsg(ResultCode.IM_MSG_NOT_EXIST_CODE));
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -15,6 +15,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
@@ -416,4 +417,17 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     public List<Integer> getCompanyIds(String dataZone ,String dataCompany) {
         return vehicleBiz.dataCompany(dataZone, dataCompany);
     }
+
+    public ObjectRestResponse delCompanyByBaseId(Integer id) {
+        Example example = new Example(BranchCompany.class);
+        example.createCriteria().andEqualTo("companyBaseId", id);
+        example.createCriteria().andEqualTo("isDel", 0);
+        BranchCompany branchCompany = mapper.selectOneByExample(example);
+        if(branchCompany == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.BRANCH_COMPANY_UNEXIST.getCode(), ResCode.BRANCH_COMPANY_UNEXIST.getDesc());
+        }
+        branchCompany.setIsDel(1);
+        updateSelectiveByIdRe(branchCompany);
+        return ObjectRestResponse.succ();
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
@@ -32,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Scanner;
 
 @Service
 @Slf4j
@@ -388,6 +386,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         companyBase.setId(id);
         companyBase.setIsDel(1);
         updateSelectiveById(companyBase);
+        branchCompanyBiz.delCompanyByBaseId(id);
         return  ObjectRestResponse.succ();
     }