77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -196,7 +196,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
             //职称
             List<SystemParameter> titleList = systemParameterService.getListByType(7);
             //专业学科
-            List<SystemParameter> specList = systemParameterService.getListByType(57);
+            List<SystemParameter> specList = systemParameterService.getListByType(68);
             list.forEach(e -> {
                 if (null != comPersonService.getPersonByCertId(e.getCertId()))
                     return;

science-admin/src/main/resources/mapper/ComExpertSpecDAO.xml

@@ -13,7 +13,7 @@
     <select id="getListByExpertId" parameterType="java.lang.String"  resultType="com.yiboshi.science.param.dto.ComExpertSpecDTO">
         SELECT a.spec_id,b.name specName
         FROM com_expert_spec a
-        left join system_parameter b on a.spec_id=b.id and b.type_id=57
+        left join system_parameter b on a.spec_id=b.id and b.type_id=68
         where expert_id=#{expertId} order by a.show_index
     </select>
     <select id="getExpertListBySpecId"  resultType="com.yiboshi.science.param.dto.ComExpertDTO">

science-admin/src/main/resources/mapper/ComPersonDAO.xml

@@ -23,7 +23,7 @@
         left join system_parameter g on e.nation=g.id and g.type_id=11
         left join system_parameter h on e.education=h.id and h.type_id=8
         left join system_parameter i on e.title=i.id and i.type_id=7
-        left join system_parameter j on e.spec=j.id and j.type_id=42
+        left join system_parameter j on e.spec=j.id and j.type_id=68
         left join system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -39,7 +39,7 @@
         left join system_parameter g on e.nation=g.id and g.type_id=11
         left join system_parameter h on e.education=h.id and h.type_id=8
         left join system_parameter i on e.title=i.id and i.type_id=7
-        left join system_parameter j on e.spec=j.id and j.type_id=42
+        left join system_parameter j on e.spec=j.id and j.type_id=68
         left join system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -62,7 +62,7 @@
         left join system_parameter c on a.nation = c.id and c.type_id = 11
         left join system_parameter d on a.education = d.id and d.type_id = 8
         left join system_parameter e on a.title = e.id and e.type_id = 7
-        left join system_parameter f on a.spec = f.id and f.type_id = 42
+        left join system_parameter f on a.spec = f.id and f.type_id = 68
         left join system_parameter h on a.degree = h.id and h.type_id = 9
         where a.id = #{id}
     </select>
@@ -73,7 +73,7 @@
                  left join system_parameter c on a.nation = c.id and c.type_id = 11
                  left join system_parameter d on a.education = d.id and d.type_id = 8
                  left join system_parameter e on a.title = e.id and e.type_id = 7
-                 left join system_parameter f on a.spec = f.id and f.type_id = 42
+                 left join system_parameter f on a.spec = f.id and f.type_id = 68
     </select>
     <select id="getManagerListByUnitId" resultType="com.yiboshi.science.param.dto.ComPersonDTO">
         SELECT a.*,b.unit_name,c.username,c.password,c.id user_id,d.id user_role_id,d.state,

science-admin/src/main/resources/mapper/ComProjectGroupAssignDAO.xml

@@ -12,8 +12,8 @@
         LEFT JOIN com_expert b ON a.expert_id = b.id
         LEFT JOIN com_person c ON b.person_id = c.id
         LEFT JOIN com_unit g ON c.unit_id = g.id
-        left join system_parameter d on a.knowledge_id = d.id and d.type_id = 57
-        left join system_parameter e on c.title=e.id and e.type_id = 7
+        left join system_parameter d on a.knowledge_id = d.id
+        left join system_parameter e on c.title=e.id 
         <where>
             ${ew.sqlSegment}
         </where>

science-admin/src/main/resources/mapper/ComProjectMembersDAO.xml

@@ -18,7 +18,7 @@
        left join system_parameter c on a.nation=c.id and c.type_id=11
        left join system_parameter d on a.title = d.id and d.type_id=7
        left join system_parameter e on a.degree=e.id and e.type_id=9
-       left join system_parameter f on a.spec=f.id and f.type_id=42
+       left join system_parameter f on a.spec=f.id and f.type_id=68
        left join com_download g on a.file_id=g.id
        where object_id=#{objectId}
        order by a.show_index asc

science-admin/src/main/resources/mapper/SystemUserDAO.xml

@@ -30,7 +30,7 @@
         LEFT JOIN system_parameter g on e.nation=g.id and g.type_id=11
         LEFT JOIN system_parameter h on e.education=h.id and h.type_id=8
         LEFT JOIN system_parameter i on e.title=i.id and i.type_id=7
-        LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=42
+        LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=68
         LEFT JOIN system_parameter k on j.parent_id = k.id
         <where>
             ${ew.sqlSegment}
@@ -47,7 +47,7 @@
                  LEFT JOIN system_parameter g on e.nation=g.id and g.type_id=11
                  LEFT JOIN system_parameter h on e.education=h.id and h.type_id=8
                  LEFT JOIN system_parameter i on e.title=i.id and i.type_id=7
-                 LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=42
+                 LEFT JOIN system_parameter j on e.spec=j.id and j.type_id=68
                  LEFT JOIN system_parameter k on j.parent_id = k.id
         where a.id = #{id}
     </select>