资料费，知识产权费，印刷费双击浏览查看页面空值问题处理。 资料费名称检索电源下所有室合并

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -838,6 +838,7 @@ public class PrjApproverecordController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/doUpdateApproveFysq", method = RequestMethod.POST)
+    @Transactional
     public BaseResult doUpdateApproveFysq(PrjApproverecord approverecord) {
 
 

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -496,6 +496,7 @@ public class StaBudgetapprovalController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "/bathUpdate/{xmid}/{sqje}", method = RequestMethod.GET)
+    @Transactional
     public Map<Object, Object> bathUpdate(@PathVariable Integer xmid, @PathVariable Double sqje, @RequestParam String spzt) {
         Map<Object, Object> res = new HashMap<>();
         //系统当前用户

src/main/resources/mapper/StaSourceFeeDao.xml

@@ -293,7 +293,17 @@
                 INNER JOIN
             sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
         where
-            sys_dept_info.dept_name = #{deptName}
+        1=1
+        <if test="deptName != null and deptName != ''">
+            and (
+            <if test="deptName.contains('电源')">
+                sys_dept_info.dept_name in (SELECT dept_name FROM sys_dept_info WHERE dept_name LIKE '%电源%')
+            </if>
+            <if test="!deptName.contains('电源')">
+                sys_dept_info.dept_name = #{deptName}
+            </if>
+            )
+        </if>
     </select>
 
 </mapper>

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -1457,6 +1457,9 @@
     function getTravelExpense() {
         return travelExpense;
     }
+    function getIntellectual() {
+        return intellectual;
+    }
 
     function getMember() {
         return tempMember;
@@ -1465,6 +1468,12 @@
     function getDevExpense() {
         return devExpense;
     }
+    function getInformation() {
+        return information;
+    }
+    function getPrintln() {
+        return println;
+    }
 
     function getSoftExpense() {
         return softExpense;