diff --git a/src/main/java/com/zcloud/controller/bus/ImgFilesController.java b/src/main/java/com/zcloud/controller/bus/ImgFilesController.java index 65dcb6b2..d4e3d6d5 100644 --- a/src/main/java/com/zcloud/controller/bus/ImgFilesController.java +++ b/src/main/java/com/zcloud/controller/bus/ImgFilesController.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -126,13 +127,14 @@ public class ImgFilesController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); PageData pd = new PageData(); - pd.put("IMGFILES_ID", this.get32UUID()); + String IMGFILES_ID = this.get32UUID(); + pd.put("IMGFILES_ID", IMGFILES_ID); pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pd.put("TYPE", TYPE); pd.put("FOREIGN_KEY", FOREIGN_KEY); - imgfilesService.save(pd); + Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,FOREIGN_KEY,TYPE); + imgfilesService.save(pd); } } diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index dc50c415..cec373b0 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -875,11 +875,11 @@ (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME from f - left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR - left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR - left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR - left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR - left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER + left join `qa-czks-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR + left join `qa-czks-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR + left join `qa-czks-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR + left join `qa-czks-prevention`.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR + left join `qa-czks-prevention`.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT