111

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -434,6 +434,7 @@ public class ActBusinessController {
             String msg_user1 = busiData.get("meeting_personnel").toString();
             String msg_title1 = busiData.get("meeting_theme").toString();
             String msg_content1 = busiData.get("meeting_content").toString();
+            String create_by = busiData.get("create_by").toString();
 
             String msg_content12 = msg_content1.replace("\n","<br>");
 
@@ -443,7 +444,7 @@ public class ActBusinessController {
             String[] userList = dmf3.split(",");
 
             HashMap<String,Object> taskParam = new HashMap<>();
-            LoginUser loginUser = sysBaseAPI.getUserByName("admin");
+            LoginUser loginUser = sysBaseAPI.getUserByName(create_by);
 
              //在主函数中。不new一个线程，直接去得到当前的线程，为主线程；
             Thread t=Thread.currentThread();
@@ -456,7 +457,7 @@ public class ActBusinessController {
                 public  void run(){
                     //发送消息
                     for (String o:userList){
-                        sysBaseAPI.sendSysAnnouncement(loginUser,"admin",o,"会议纪要","<h2>会议主题："+msg_title1+"</h2><br> <h3>会议内容：<br>"+msg_content12+"</h3>", CommonConstant.MSG_CATEGORY_2,taskParam);
+                        sysBaseAPI.sendSysAnnouncement(loginUser,create_by,o,"会议纪要","<h2>会议主题："+msg_title1+"</h2><br> <h3>会议内容：<br>"+msg_content12+"</h3>", CommonConstant.MSG_CATEGORY_2,taskParam);
                     }
 
                     actBusiness.setStatus(2);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -46,7 +46,7 @@
 		select field_name as "text", replace_val as "value" FROM
 			onl_cgreport_item
 		WHERE
-			cgrhead_id	in(select id from onl_cgreport_head where code=#{tableName})
+			cgrhead_id = #{tableName}	<!--in(select id from onl_cgreport_head where code=#{tableName})-->
 	</select>
 
 	<!--通过查询指定table的 text code key 获取字典值，包含value-->