lenovodn 2 years ago
parent
commit
3baa3a2792

+ 4 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleInfoController.java

@@ -225,6 +225,10 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         List<MedicalDto> dictDtos = new ArrayList<>();
         if (medicalInsRuleInfo.getSelectedRoles() != null) {
             dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
+            MedicalDto state = new MedicalDto();
+            state.setText("状态");
+            state.setValue("state");
+            dictDtos.add(state);
         }
 
         MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();

+ 11 - 0
jeecg-module-system/jeecg-system-biz/src/test/java/org/jeecg/Test.java

@@ -0,0 +1,11 @@
+//package org.jeecg;
+//
+//
+//import org.junit.runner.RunWith;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
+//public class Test {
+//}

+ 1 - 1
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/SpelTest.java

@@ -44,7 +44,7 @@ public class SpelTest {
 
         JSONObject obj = new JSONObject();
         obj.put("type", "before");
-        obj.put("id", 12);
+        obj.put("id", 1);
         webSocket.sendMessage("172.20.10.4",obj.toJSONString());
     }