flow

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -29,7 +29,6 @@ import org.springframework.transaction.TransactionStatus;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -227,16 +226,16 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         return Boolean.parseBoolean(String.valueOf(execute));
     }
 
-    public static void main(String[] args) {
-        // HashMap<Object, Object> map1 = new HashMap<>();
-        // map1.put("test2", "2");
-        //
-        HashMap<String, Object> map2 = new HashMap<>();
-
-        map2.put("admin3", "dsaasdsad");
-        map2.put("admin1", 2);
-
-        System.out.println(expressionResult(map2, "admin1 > 2"));
-    }
+    // public static void main(String[] args) {
+    //     // HashMap<Object, Object> map1 = new HashMap<>();
+    //     // map1.put("test2", "2");
+    //     //
+    //     HashMap<String, Object> map2 = new HashMap<>();
+    //
+    //     map2.put("admin3", "dsaasdsad");
+    //     map2.put("admin1", 2);
+    //
+    //     System.out.println(expressionResult(map2, "admin1 > 2"));
+    // }
 
 }

hx-tenant/src/main/java/com/fjhx/tenant/service/tenant/impl/TenantInfoServiceImpl.java

@@ -224,8 +224,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
                     return sysRoleMenu;
                 })
                 .collect(Collectors.toList());
-        sysRoleMenuMapper.batchRoleMenu(sysRoleMenuList);
-
+        if (sysRoleMenuList.size() > 0) {
+            sysRoleMenuMapper.batchRoleMenu(sysRoleMenuList);
+        }
     }
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -490,4 +490,5 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUser> getListByUserId(List<Long> userIdList) {
         return listByIds(userIdList);
     }
+
 }