Merge remote-tracking branch 'origin/master' into master

gdg

2020-12-10 b805858ea0341e13f6213c3a9b01da6a13d22f83

 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java

@@ -63,6 +63,10 @@
             if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                 params.put("applyUserId", applyUserId);
             }

                if("连悦".equals(sysUser.getName())){
                    params.remove("applyUserId");
                }
          }

            params.put("approveUserId", approveUserId);
@@ -177,6 +181,10 @@
             if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                 params.put("applyUserId", applyUserId);
             }

             if("连悦".equals(sysUser.getName())){
                    params.remove("applyUserId");
                }
          }

            params.put("approveUserId", approveUserId);