二次保存

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java

@@ -64,8 +64,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     }
 
     @SneakyThrows
-//    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @Transactional(propagation = Propagation.NEVER)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+//    @Transactional(propagation = Propagation.NEVER)
     @Override
     protected String saveBizAndApprovalData() {
         super.saveBizAndApprovalData();
@@ -75,15 +75,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
         } else {
             proofingApply = (ProofingApplyBaseInfo) commonDomainService.loadAndFillinProperties(proofingApply);
         }
-        //二次保存不添加id
-
-        if (proofingApply.getId() == null || proofingApply.getId().isEmpty()) {
-            String id = UUID.randomUUID().toString().replace("-", "");
-            proofingApply.setProofingApplyId(id);
-        }else{
-            ProofingApplyBaseInfo one = this.loadProofingApplyById(proofingApply.getId());
-            proofingApply.setProofingApplyId(one.getProofingApplyId());
-        }
+
         //如果录入了ng重新打样原因，则更改状态为不通过
         if(!StringUtil.isBlank(proofingApply.getProofingApplyNgReReason())){
             proofingApply.setProofingApplyApplicationStatus("2");

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java

@@ -71,6 +71,8 @@ public class ProofingApplyController extends CommonController {
         Operator operator = getOperator();//获取当前操作员的详情信息
         proofingApply.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
         proofingApply.setProofingApplyNo(proofingApply.getBillCode()); //将生成的单号赋予实体类对应字段
+        String id = UUID.randomUUID().toString().replace("-", "");
+        proofingApply.setProofingApplyId(id);
         return forward("proofingApply",proofingApply);
     }
 

topsun/target/classes/config/topsun/proofing/proofingApply.xml

@@ -3,12 +3,13 @@
 
     <query name="slicedQuery" table="proofing_apply">
         <sql-query>
-            select t.* from proofing_apply_base_info t where 1=1
+            select t.* from proofing_apply_base_info t
+<!--            where 1=1-->
         </sql-query>
-        <permissions>
-            <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>
-            <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>
-        </permissions>
+<!--        <permissions>-->
+<!--            <permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>-->
+<!--            <permission column="full_id" symbol="half_like" alias="t" kind="fullId" manageType="demoQueryLeave,admin"/>-->
+<!--        </permissions>-->
     </query>