|
@@ -580,7 +580,19 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
if (null != clipId && !"".equals(clipId.trim())) {
|
|
|
materialAscription.setClipId(clipId);
|
|
|
}
|
|
|
- materialAscription.setShotId(ascription.getString("shotId"));
|
|
|
+ String shotId = ascription.getString("shotId");
|
|
|
+ if(!Check.isNull(shotId)){
|
|
|
+ materialAscription.setShotId(shotId);
|
|
|
+ SysUser shot = userService.getById(shotId);
|
|
|
+ String shotCode = userService.getRoleCodeByUserId(shotId);
|
|
|
+ if("designTeamLeader".equals(shotCode)){
|
|
|
+ materialAscription.setShotLeaderId(shotId);
|
|
|
+ materialAscription.setShotLeaderName(shot.getRealname());
|
|
|
+ }else {
|
|
|
+ materialAscription.setShotLeaderId(shot.getLeaderId());
|
|
|
+ materialAscription.setShotLeaderName(shot.getLeaderName());
|
|
|
+ }
|
|
|
+ }
|
|
|
materialAscription.setPlanId(ascription.getString("planId"));
|
|
|
materialAscription.setPlaneId(ascription.getString("planeId"));
|
|
|
materialAscription.setCode(info.getCode());
|
|
@@ -753,7 +765,22 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
if (null != clipId && !"".equals(clipId.trim())) {
|
|
|
materialAscription.setClipId(clipId);
|
|
|
}
|
|
|
- materialAscription.setShotId(ascription.getString("shotId"));
|
|
|
+
|
|
|
+ String shotId = ascription.getString("shotId");
|
|
|
+ if(!Check.isNull(shotId)){
|
|
|
+ materialAscription.setShotId(shotId);
|
|
|
+ SysUser shot = userService.getById(shotId);
|
|
|
+ String shotCode = userService.getRoleCodeByUserId(shotId);
|
|
|
+ if("designTeamLeader".equals(shotCode)){
|
|
|
+ materialAscription.setShotLeaderId(shotId);
|
|
|
+ materialAscription.setShotLeaderName(shot.getRealname());
|
|
|
+ }else {
|
|
|
+ materialAscription.setShotLeaderId(shot.getLeaderId());
|
|
|
+ materialAscription.setShotLeaderName(shot.getLeaderName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
materialAscription.setPlanId(ascription.getString("planId"));
|
|
|
materialAscription.setPlaneId(ascription.getString("planeId"));
|
|
|
materialAscription.setCode(info.getCode());
|