From 4781b9837aaa701b8cc36adf1ef3eb6b06bdbf9b Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 10 Jan 2022 18:11:12 +0800
Subject: [PATCH] 20211213

---
 .../java/com/gaotao/modules/base/dao/BaseMapper.java  | 11 +++++++++++
 .../modules/base/service/Impl/BaseServiceImpl.java    |  6 ++++++
 src/main/resources/mapper/base/BaseMapper.xml         |  4 ++++
 .../mapper/shopOrder/ReportFormSearchMapper.xml       |  4 ++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
index f69288f..11c195d 100644
--- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
@@ -787,6 +787,17 @@ public interface BaseMapper {
      * @throw
      */
     void deleteCompanyInformation(CompanyData inData);
+    
+    /**
+     * @Description TODO
+     * @Title checkCompanyInSite 
+      * @param inData 
+     * @author rq
+     * @date 2022/1/10 17:10 
+     * @return List<SiteData>
+     * @throw
+     */
+    List<SiteData> checkCompanyInSite(CompanyData inData);
 
     /**
      * @Method getPartFamilyList
diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index be3baa5..5eb8b50 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -1120,6 +1120,12 @@ public class BaseServiceImpl implements BaseService {
     @Override
     public ResponseData deleteCompanyInformation(CompanyData inData) {
         ResponseData responseData = new ResponseData();
+        List<SiteData> check= baseMapper.checkCompanyInSite(inData);
+        if(check.size()>0){
+            responseData.setMsg("该会计单位已被使用无法删除！");
+            responseData.setCode("500");
+            return responseData;
+        }
         baseMapper.deleteCompanyInformation(inData);
         responseData.setCode("200");
         responseData.setSuccess(true);
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index e43926d..925ca03 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -583,4 +583,8 @@ CapacityType,UMID,Active,Remark,CreatedDate,ProLineNo,CanCreateNewRollFlag,NeedS
         Select  ConfigurationTemplateID
         from Part  where ConfigurationTemplateID=#{configurationTemplateID} and site=#{site}
     </select>
+
+    <select id="checkCompanyInSite" resultType="com.gaotao.modules.base.entity.SiteData">
+        Select SiteID from site where CompanyID=#{companyID}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
index 0af72e8..785705c 100644
--- a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
@@ -446,7 +446,7 @@ FROM
             AND T.part_no like #{partNo}
         </if>
           <if test=" operatorDesc != null and operatorDesc != ''">
-            AND t.OperationDesc like #{operatorDesc}
+            AND dbo.Get_OperatorDesc(t.site,t.OperatorID) like #{operatorDesc}
         </if>
            <if test=" sResourceid != null and sResourceid != ''">
             AND Reportedby like #{sResourceid}
@@ -502,7 +502,7 @@ GROUP BY
             AND T.part_no like #{partNo}
         </if>
           <if test=" operatorDesc != null and operatorDesc != ''">
-            AND t.OperationDesc like #{operatorDesc}
+            AND dbo.Get_OperatorDesc(t.site,t.OperatorID) like #{operatorDesc}
         </if>
            <if test=" sResourceid != null and sResourceid != ''">
             AND Reportedby like #{sResourceid}