Merge pull request #105 from codingapi/dev

fix permission bug

Author: xlorne

flow-engine-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

flow-engine-framework/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
     </parent>
 
     <name>flow-engine-framework</name>

flow-engine-framework/src/main/java/com/codingapi/flow/form/FlowForm.java

@@ -114,11 +114,30 @@ public List<String> loadFieldNames() {
     /**
      * 获取表单字段
      *
-     * @param fieldName 字段名称
+     * @param fieldCode 字段code
      * @return 表单字段
      */
-    public FormField getField(String fieldName) {
-        return fields.stream().filter(field -> field.getName().equals(fieldName)).findFirst().orElse(null);
+    public FormField getField(String fieldCode) {
+        return fields.stream().filter(field -> field.getCode().equals(fieldCode)).findFirst().orElse(null);
+    }
+
+
+    /**
+     * 获取表单字段
+     * @param formCode 表单code
+     * @param fieldCode 字段code
+     */
+    public FormField getField(String formCode,String fieldCode){
+        if(this.code.equals(formCode)){
+            return this.getField(fieldCode);
+        }else {
+            for (FlowForm subForm:subForms){
+                if(subForm.getCode().equals(formCode)){
+                    return subForm.getField(fieldCode);
+                }
+            }
+        }
+        return null;
     }
 
     private void initFormFieldDataTypes(FlowForm form, Map<String, DataType> types) {

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java

@@ -159,12 +159,16 @@ public NextNodeLoader(IFlowNode currentNode) {
 
         private void fetchNextNode(FlowSession flowSession, List<IFlowNode> nexNodes) {
             for (IFlowNode flowNode : nexNodes) {
+                ActionManager actionManager = flowNode.actionManager();
+                IFlowAction passAction =  actionManager.getAction(PassAction.class);
+                flowSession = flowSession.updateSession(passAction);
+
                 List<IFlowOperator> operators = null;
                 if (flowNode.getType().equals(StartNode.NODE_TYPE)) {
                     operators = List.of(flowSession.getCurrentOperator());
                 } else {
                     NodeStrategyManager nodeStrategyManager = flowNode.strategyManager();
-                    OperatorManager operatorManager = nodeStrategyManager.loadOperators(flowSession);
+                    OperatorManager operatorManager = nodeStrategyManager.loadOperators(flowSession.updateSession(flowNode));
                     operators = operatorManager.getOperators();
                 }
                 ProcessNode processNode = new ProcessNode(flowNode, operators);

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/FormFieldPermissionStrategy.java

@@ -5,6 +5,7 @@
 import com.codingapi.flow.exception.FlowValidationException;
 import com.codingapi.flow.form.DataType;
 import com.codingapi.flow.form.FlowForm;
+import com.codingapi.flow.form.FormField;
 import com.codingapi.flow.form.permission.FormFieldPermission;
 import com.codingapi.flow.form.permission.PermissionType;
 import com.codingapi.flow.session.FlowSession;
@@ -62,6 +63,7 @@ public void verifySession(FlowSession session) {
         Map<String, Object> latestData = session.getFormData().toMapData();
         if(fieldPermissions!=null) {
             for (FormFieldPermission permission : fieldPermissions) {
+                FormField formField =  flowForm.getField(permission.getFormCode(),permission.getFieldCode());
                 // 子表
                 if (flowForm.isSubForm(permission.getFormCode())) {
                     if (permission.getType() == PermissionType.READ) {
@@ -87,10 +89,10 @@ public void verifySession(FlowSession session) {
                     }
                 } else {
                     // 在只读权限下不允许修改数据
-                    if (permission.getType() == PermissionType.READ) {
+                    if (formField.isRequired() && permission.getType() == PermissionType.READ) {
                         Object currentValue = currentData.get(permission.getFieldCode());
                         Object latestValue = latestData.get(permission.getFieldCode());
-                        if (!currentValue.equals(latestValue)) {
+                        if (latestValue!=null && currentValue!=null && !currentValue.equals(latestValue)) {
                             throw FlowValidationException.fieldReadOnly(permission.getFieldCode());
                         }
                     }

flow-engine-starter-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
     </parent>
 
     <name>flow-engine-starter-api</name>

flow-engine-starter-infra/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
     </parent>
 
     <name>flow-engine-starter-infra</name>

flow-engine-starter-query/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
     </parent>
 
     <name>flow-engine-starter-query</name>

flow-engine-starter/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.7</version>
+        <version>0.0.8</version>
     </parent>
 
     <name>flow-engine-starter</name>

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.codingapi.flow</groupId>
 	<artifactId>flow-engine-parent</artifactId>
-	<version>0.0.7</version>
+	<version>0.0.8</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/codingapi/flow-engine</url>