diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
index e35912a..a9022ab 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
@@ -207,16 +207,21 @@ public interface IGyzjService extends IService<Gyzj> {
 
     /**
      * 存储
+     * @param form
      */
     public void cc(CcForm form);
 
     /**
      * 取出
+     * @param form
      */
     public void qc(CcForm form);
 
     /**
      * 表单生成
+     * @param studyFormFill
+     * @param template
+     * @param remark
      */
     void genResource(StudyFormFill studyFormFill, Template template,String remark);
 
@@ -234,36 +239,43 @@ public interface IGyzjService extends IService<Gyzj> {
 
     /**
      * 同意归档
+     * @param form
      */
     public void tygd(ArchiveForm form);
 
     /**
      * 拒绝归档
+     * @param form
      */
     public void jjgd(ArchiveForm form);
 
     /**
      * 同意解档
+     * @param form
      */
     public void tyjd(ArchiveForm form);
 
     /**
      * 拒绝解档
+     * @param form
      */
     public void jjjd(ArchiveForm form);
 
     /**
      * 同意借阅
+     * @param form
      */
     public void tyjy(ArchiveForm form);
 
     /**
      * 拒绝借阅
+     * @param form
      */
     public void jjjy(ArchiveForm form);
 
     /**
      * 确认归还
+     * @param form
      */
     public void qrgh(ArchiveForm form);
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
index 3c9b972..c7066e8 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
@@ -192,16 +192,21 @@ public interface IMjyService extends IService<Mjy> {
 
     /**
      * 存储
+     * @param form
      */
     public void cc(CcForm form);
 
     /**
      * 取出
+     * @param form
      */
     public void qc(CcForm form);
 
     /**
      * 表单生成
+     * @param studyFormFill
+     * @param template
+     * @param remark
      */
     void genResource(StudyFormFill studyFormFill, Template template,String remark);
 
@@ -219,41 +224,49 @@ public interface IMjyService extends IService<Mjy> {
 
     /**
      * 同意归档
+     * @param form
      */
     public void tygd(ArchiveForm form);
 
     /**
      * 拒绝归档
+     * @param form
      */
     public void jjgd(ArchiveForm form);
 
     /**
      * 同意解档
+     * @param form
      */
     public void tyjd(ArchiveForm form);
 
     /**
      * 拒绝解档
+     * @param form
      */
     public void jjjd(ArchiveForm form);
 
     /**
      * 同意借阅
+     * @param form
      */
     public void tyjy(ArchiveForm form);
 
     /**
      * 拒绝借阅
+     * @param form
      */
     public void jjjy(ArchiveForm form);
 
     /**
      * 确认归还
+     * @param form
      */
     public void qrgh(ArchiveForm form);
 
     /**
      * 借阅到期自动归还
+     * @param form
      */
     public void autoJyExpireReturn();
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
index 9b152e2..f64b71b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
@@ -422,7 +422,6 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("转移条件", form.getGhzytj());
         formData.put("入库净重", form.getRkl() + gyzj.getKcdw());
         formData.put("入库毛重", form.getRkmz() + gyzj.getKcdw());
-//        formData.put("使用量", gyzjFfjl.getSyl() + gyzj.getKcdw());
         formData.put("归还人1", ghr1.getNickName());
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index a703751..ea15df0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -1330,7 +1330,8 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         List<Gyzj> gyzjList = new ArrayList<>();
         LinkedList<GyzjJcgj> jcgjList = new LinkedList<>();
         LinkedList<GyzjTz> tzList = new LinkedList<>();
-        if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) {
+        String empty="[]";
+        if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) {
             List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
             String ss="1";
             List<StudyFormFillResource> tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) ||(p.getType()!=null&&StudyFormFillResourceTypeEnum.gyzj.getValue()==p.getType())).collect(Collectors.toList());
@@ -1395,7 +1396,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (gyzjMap.size() > 0) {
             // 存储
             String cclist = studyFormFill.getCclist();
-            if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
+            if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {
                 List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
                 for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
                     List<String> list=new ArrayList<>();
@@ -1420,7 +1421,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
             // 处置，库存全变为0
             String czlist = studyFormFill.getCzlist();
-            if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
+            if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) {
                 List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
                 for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
                     List<String> list=new ArrayList<>();
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
index 6a5029b..1249f1e 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
@@ -1233,7 +1233,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         List<Mjy> mjyList = new ArrayList<>();
         LinkedList<MjyJcgj> jcgjList = new LinkedList<>();
         LinkedList<MjyTz> tzList = new LinkedList<>();
-        if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) {
+        String empty="[]";
+        if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) {
             List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
             List<StudyFormFillResource> tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType()!=null&&StudyFormFillResourceTypeEnum.mjy.getValue()==p.getType())).collect(Collectors.toList());
             // 根据编号获取需要处置的列表
@@ -1298,7 +1299,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         if (mjyMap.size() > 0) {
             // 存储
             String cclist = studyFormFill.getCclist();
-            if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) {
+            if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {
                 List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
                 for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
                     List<String> list=new ArrayList<>();
@@ -1323,7 +1324,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
 
             // 处置，库存全变为0
             String czlist = studyFormFill.getCzlist();
-            if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) {
+            if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) {
                 List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
                 for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
                     List<String> list=new ArrayList<>();