逻辑删除改成物理删除

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -132,13 +132,13 @@ public class SysDeptController {
         SysDeptEntity entity = sysDeptDao.select(id);
         if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
             //删除customer_grid
-            customerGridDao.deleteById(id.toString());
+            customerGridDao.deleteGridById(id.toString());
         } else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
             //customer_department
-            customerDepartmentDao.deleteById(id.toString());
+            customerDepartmentDao.deleteDepartmentById(id.toString());
         } else {
             //同步agency
-            customerAgencyDao.deleteById(id.toString());
+            customerAgencyDao.deleteAgencyById(id.toString());
         }
 
         sysDeptService.deleteBatchIds(Arrays.asList(new Long[]{id}));

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerAgencyDao.java

@@ -29,5 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
-	
+
-}
+    void deleteAgencyById(String id);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerDepartmentDao.java

@@ -22,12 +22,13 @@ import com.elink.esua.epdc.entity.CustomerDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 客户部门表  
+ * 客户部门表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-12-16
  */
 @Mapper
 public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity> {
-	
+
-}
+    void deleteDepartmentById(String id);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerGridDao.java

@@ -22,12 +22,13 @@ import com.elink.esua.epdc.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 客户网格表 
+ * 客户网格表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-12-15
  */
 @Mapper
 public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
-	
+
-}
+    void deleteGridById(String id);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerStaffAgencyDao.java

@@ -29,5 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntity> {
-	
+
-}
+    void deleteStaffAgencyById(String id);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerStaffDepartmentDao.java

@@ -22,12 +22,13 @@ import com.elink.esua.epdc.entity.CustomerStaffDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 部门人员关系表 
+ * 部门人员关系表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-12-21
  */
 @Mapper
 public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartmentEntity> {
-	
+
-}
+    void deleteStaffDepartmentById(String toString);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/CustomerStaffGridDao.java

@@ -22,12 +22,13 @@ import com.elink.esua.epdc.entity.CustomerStaffGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 网格人员关系表 
+ * 网格人员关系表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-12-21
  */
 @Mapper
 public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
-	
+
-}
+    void deleteStaffGridById(String id);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -239,13 +239,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 packageDepartment(entity,customerDepartmentEntity);
                 customerDepartmentEntity.setTotalUser(customerGridEntity.getTotalUser());
                 customerDepartmentDao.insert(customerDepartmentEntity);
-                customerGridDao.deleteById(entity.getId().toString());
+                customerGridDao.deleteGridById(entity.getId().toString());
             }else {
                 CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
                 packageAgency(entity,customerAgencyEntity);
                 customerAgencyEntity.setTotalUser(customerGridEntity.getTotalUser());
                 customerAgencyDao.insert(customerAgencyEntity);
-                customerGridDao.deleteById(entity.getId().toString());
+                customerGridDao.deleteGridById(entity.getId().toString());
             }
         }else if(deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)){
             CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(dto.getId().toString());
@@ -254,7 +254,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 packageGrid(entity,customerGridEntity);
                 customerGridEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
                 customerGridDao.insert(customerGridEntity);
-                customerDepartmentDao.deleteById(entity.getId().toString());
+                customerDepartmentDao.deleteDepartmentById(entity.getId().toString());
             } else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
                 customerDepartmentEntity.setAgencyId(entity.getPid().toString());
                 customerDepartmentEntity.setDepartmentName(entity.getName());
@@ -264,7 +264,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 packageAgency(entity,customerAgencyEntity);
                 customerAgencyEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
                 customerAgencyDao.insert(customerAgencyEntity);
-                customerDepartmentDao.deleteById(entity.getId().toString());
+                customerDepartmentDao.deleteDepartmentById(entity.getId().toString());
             }
         }else {
             CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getId().toString());
@@ -273,13 +273,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 packageGrid(entity,customerGridEntity);
                 customerGridEntity.setTotalUser(customerAgencyEntity.getTotalUser());
                 customerGridDao.insert(customerGridEntity);
-                customerAgencyDao.deleteById(entity.getId().toString());
+                customerAgencyDao.deleteAgencyById(entity.getId().toString());
             } else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
                 CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
                 packageDepartment(entity,customerDepartmentEntity);
                 customerDepartmentEntity.setTotalUser(customerAgencyEntity.getTotalUser());
                 customerDepartmentDao.insert(customerDepartmentEntity);
-                customerAgencyDao.deleteById(entity.getId().toString());
+                customerAgencyDao.deleteAgencyById(entity.getId().toString());
             }else {
                 packageEntity(entity, customerAgencyEntity);
                 customerAgencyDao.updateById(customerAgencyEntity);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -213,14 +213,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
                     packageDepartment(entity, departmentEntity);
                     customerStaffDepartmentDao.insert(departmentEntity);
-                    customerStaffGridDao.deleteById(entity.getId().toString());
+                    customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
                     //更新后的total_user +1
                     updateDepartmentTotalUserAfter(deptEntity);
                 } else {
                     CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
                     packageAgency(entity, agencyEntity);
                     customerStaffAgencyDao.insert(agencyEntity);
-                    customerStaffGridDao.deleteById(entity.getId().toString());
+                    customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
                     //更新后的total_user +1
                     updateAgencyTotalUserAfter(deptEntity);
                 }
@@ -231,7 +231,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
                     packageGrid(entity, gridEntity);
                     customerStaffGridDao.insert(gridEntity);
-                    customerStaffDepartmentDao.deleteById(entity.getId().toString());
+                    customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
                     //更新后的total_user +1
                     updateGridTotalUserAfter(deptEntity);
                 } else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
@@ -242,7 +242,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
                     packageAgency(entity, agencyEntity);
                     customerStaffAgencyDao.insert(agencyEntity);
-                    customerStaffDepartmentDao.deleteById(entity.getId().toString());
+                    customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
                     //更新后的total_user +1
                     updateAgencyTotalUserAfter(deptEntity);
                 }
@@ -253,14 +253,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
                     CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
                     packageGrid(entity, gridEntity);
                     customerStaffGridDao.insert(gridEntity);
-                    customerStaffAgencyDao.deleteById(entity.getId().toString());
+                    customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
                     //更新后的total_user +1
                     updateGridTotalUserAfter(deptEntity);
                 } else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
                     CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
                     packageDepartment(entity, departmentEntity);
                     customerStaffDepartmentDao.insert(departmentEntity);
-                    customerStaffAgencyDao.deleteById(entity.getId().toString());
+                    customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
                     //更新后的total_user +1
                     updateDepartmentTotalUserAfter(deptEntity);
                 } else {

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -29,5 +29,8 @@
         <result property="parentAreaCode" column="PARENT_AREA_CODE"/>
     </resultMap>
 
+    <delete id="deleteAgencyById">
+        delete from epmet_gov_org.customer_agency where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -19,5 +19,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteDepartmentById">
+        delete from epmet_gov_org.customer_department where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -24,5 +24,8 @@
         <result property="pids" column="PIDS"/>
     </resultMap>
 
+    <delete id="deleteGridById">
+        delete from epmet_gov_org.customer_grid where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -16,5 +16,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteStaffAgencyById">
+        delete from epmet_gov_org.customer_staff_agency where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml

@@ -16,5 +16,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteStaffDepartmentById">
+        delete from epmet_gov_org.customer_staff_department where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -16,5 +16,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteStaffGridById">
+        delete from epmet_gov_org.customer_staff_grid where id =#{id}
+    </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -252,32 +252,29 @@
         where id =#{id}
     </update>
 
-    <update id="deleteAgencyBatchIds">
+    <delete id="deleteAgencyBatchIds">
-        update epmet_gov_org.customer_staff_agency
+        delete from epmet_gov_org.customer_staff_agency
-        set DEL_FLAG='1'
         where id in
         <foreach collection="agencyIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-    </update>
+    </delete>
 
-    <update id="deleteDepartmentBatchIds">
+    <delete id="deleteDepartmentBatchIds">
-        update epmet_gov_org.customer_staff_department
+        delete from epmet_gov_org.customer_staff_department
-        set DEL_FLAG='1'
         where id in
         <foreach collection="departmentIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-    </update>
+    </delete>
 
-    <update id="deleteGridBatchIds">
+    <delete id="deleteGridBatchIds">
-        update epmet_gov_org.customer_staff_grid
+        delete from epmet_gov_org.customer_staff_grid
-        set DEL_FLAG='1'
         where id in
         <foreach collection="gridIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-    </update>
+    </delete>
 
     <update id="updateTotalUserGridBatch">
         update epmet_gov_org.customer_grid