提交

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -304,8 +304,8 @@ public class SpmkController {
 	@ApiOperationSupport(order = 10)
 	public Result<Object> deleteAgById(@PathVariable int id){
 		
-		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
-			return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
+//		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
+//			return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
 		
         return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -75,8 +75,8 @@
         LEFT JOIN spmk_custom_approval b 
         ON a.id = b.approval_g_id 
         WHERE a.org_code = #{org_code}  
-        ORDER BY a.ranks, b.ranks
-    </select>
+        ORDER BY a.ranks, b.ranks,b.id DESC
+    </select> 
     
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
         SELECT