建设方案文件修改

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AnnualPlanLibManage.java

@@ -18,6 +18,7 @@ import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.common.model.entity.ExcelExportWriter;
 import com.hz.pm.api.common.statemachine.util.StateMachineUtils;
+import com.hz.pm.api.common.util.BizUtils;
 import com.hz.pm.api.common.util.ExcelDownUtil;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.utils.DataScopeUtil;
@@ -164,7 +165,7 @@ public class AnnualPlanLibManage {
         project.setApprovedFile(String.valueOf(req.getApprovedFileId()));
         project.setBuildCycle(String.valueOf(req.getBuildCycle()));
         project.setOriginBuildCycle(req.getBuildCycle());
-        project.setApprovedConstructionPlanFile(String.valueOf(req.getBuildPlanFileId()));
+        BizUtils.notNull(req.getBuildPlanFileId(),w -> project.setApprovedConstructionPlanFile(String.valueOf(w)));
         project.setApprovalDate(req.getApprovedDate());
         project.setPlanAcceptanceTime(planAcceptanceTime);
         project.setOriginPlanAcceptanceTime(planAcceptanceTime);

hz-pm-api/src/main/java/com/hz/pm/api/user/controller/UserAuthController.java

@@ -96,7 +96,7 @@ public class UserAuthController {
     @ApiOperation(value = "代登陆")
     @WebLog("代登录（代理接口）")
     public void proxyAuthCodeLogin(@RequestParam(value = "userId") Long userId,
-                                   @RequestParam(value = "username") String username,
+                                   @RequestParam(value = "userName") String username,
                                    @RequestParam(value = "timestamp") long timestamp,
                                    @RequestParam(value = "sign") String sign,
                                    HttpServletRequest request,