Merge branch 'zhuwei' into dev

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -800,6 +800,7 @@ public class ExcelTabController extends BladeController {
                 this.excelTabService.gsColor(pkeyId, process.getPKeyId().toString(), wbsTreeContract.getProjectId(), doc);
             }
             doc.select("Col").remove();
+
             org.springblade.manager.entity.TableInfo tableInfo = this.tableInfoService.getOne(Wrappers.<org.springblade.manager.entity.TableInfo>lambdaQuery().select(org.springblade.manager.entity.TableInfo::getId)
                     .eq(org.springblade.manager.entity.TableInfo::getTabEnName, wbsTreeContract.getInitTableName()).eq(org.springblade.manager.entity.TableInfo::getIsDeleted, 0).last("limit 1"));
             if (tableInfo != null ) {
@@ -817,6 +818,9 @@ public class ExcelTabController extends BladeController {
                     });
                 }
             }
+            // 电签显示文件
+           // List<TextdictInfoVO> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
+
             fileInputStream.close();
             return R.data(table + "");
         } catch (Exception e) {

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/SaveUserInfoByProjectMapper.xml

@@ -73,7 +73,7 @@
     <select id="queryCurrentUserDownAllContractAndProjectId" resultMap="contractInfoResultMap">
         select project_id, contract_id
         from m_project_assignment_user
-        where is_deleted = 0
+        where is_deleted = 0 and project_id is not null and contract_id is not null
           and user_id = #{userId}
     </select>
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TextdictInfoMapper.java

@@ -46,8 +46,12 @@ public interface TextdictInfoMapper extends EasyBaseMapper<TextdictInfo> {
 
 
     List<TextdictInfoVO> selectTextdictInfoByExcelId(IPage page, TextdictInfoVO textdictInfo);
+
     List<TextdictInfoVO> selectTextdictBYIds(@Param("ids") List<String> ids,@Param("projectId") String projectId);
 
     TextdictInfo selectTextdictInfoOne(@Param("id") String id,@Param("sigRoleId") String sigRoleId,@Param("projectId") String projectId);
 
+    //通过表单Id 获取电签信息
+    List<TextdictInfoVO> getTextdictListInfoByPkeyId(@Param("tabId") String tabId,@Param("projectId") String projectId);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TextdictInfoMapper.xml

@@ -65,4 +65,8 @@
             and sig_role_id = #{sigRoleId}
             and project_id= #{projectId}
     </select>
+
+    <select id="getTextdictListInfoByPkeyId" resultMap="textdictInfoVoResultMap">
+        SELECT a.* from m_textdict_info a where 1=0
+    </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/ITextdictInfoService.java

@@ -26,6 +26,8 @@ import org.springblade.manager.vo.TextdictInfoVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 参数信息表 服务类
  *
@@ -54,4 +56,7 @@ public interface ITextdictInfoService extends IService<TextdictInfo> {
     void removeHtmlDefault(String tabId, String colKey);
 
     void saveHtmlDefault(TextdictBy345VO textdictInfo);
+
+    //表单获取电签信息
+    List<TextdictInfoVO> getTextdictListInfoByPkeyId(String tabId,String projectId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TextdictInfoServiceImpl.java

@@ -227,6 +227,12 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
 
 
 
+    }
+
+    @Override
+    public List<TextdictInfoVO> getTextdictListInfoByPkeyId(String tabId,String projectId) {
+        return  baseMapper.getTextdictListInfoByPkeyId(tabId,projectId);
+
     }
 
     @Override