易发布账户问题修改

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/TemplateMapper.java

@@ -163,4 +163,10 @@ public interface TemplateMapper {
     void updateCommonNeuuser(Map<String, Object> cmap);
 
     List<CertInfo> queryCertInfoByCertId(Integer id);
+
+    void saveCommonUser(Map<String, Object> pamp);
+
+    Integer getGeeRunnerSysAdmin(int userId);
+
+    void updateCommonUser(@Param("guserId") int userId,@Param("gtUserId") Integer gk_userId);
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/TemplateMapper.xml

@@ -794,4 +794,22 @@
         from geerunner.certificatesetinfo
         where certid = #{certid}
 	</select>
+
+    <insert id="saveCommonUser">
+        insert into common.neuuser(gUserId,wUserId,gtUserId,role)
+        values (#{userId},-1,#{id},1)
+    </insert>
+
+    <select id="getGeeRunnerSysAdmin" resultType="java.lang.Integer">
+      select id from geerunner.sys_admin where user_id in (
+          select callPhone from raceenroll.registerInfo r
+          where r.userId = #{userId}
+        )
+    </select>
+
+    <update id="updateCommonUser">
+        update common.neuuser
+        set gtuserid = #{gtUserId},wUserId=-1,role=1
+        where gUserId = #{guserId}
+    </update>
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/TemplateService.java

@@ -16,6 +16,7 @@ import java.util.Map;
 
 @Service
 @Slf4j
+@Transactional
 public class TemplateService {
 
     @Resource
@@ -49,14 +50,28 @@ public class TemplateService {
         Integer gk_userId = templateMapper.getGeerunnerUserId(userId);
 
         if( gk_userId == null || gk_userId == -1 ) { // 如果获取不到组委会账户的ID，则需要创建一个组委会账户
+            Integer gtUserId = templateMapper.getGeeRunnerSysAdmin(userId); // 先判断是否有存在记录
+            log.info("获取到的计时账户："+gtUserId);
             isNewGkUser = true;
-            orgId = "1-3-"+ templateMapper.getGeerunnerSeqVal("ZDHW"); // TODO 不知道生成组织id的序列是哪一个？
             Map<String, Object> pamp_user = new HashMap<>();
             pamp_user.put("userId", userId);
             pamp_user.put("org_id", orgId);
-            pamp_user.put("id", "");
-            templateMapper.copyRaceRegisterInfoToGeerunnerSysAdmin(pamp_user);
+            pamp_user.put("id", gtUserId == null ? "" : gtUserId);
+            if(gtUserId == null){ // 无记录
+                orgId = "1-3-"+ templateMapper.getGeerunnerSeqVal("ZDHW"); // TODO 不知道生成组织id的序列是哪一个？
+                templateMapper.copyRaceRegisterInfoToGeerunnerSysAdmin(pamp_user);
+                log.info("无计时组委会账户："+gk_userId);
+            }
             gk_userId = Integer.valueOf(pamp_user.get("id").toString());
+
+            if(gk_userId == null) { // 缺少common表neuuser
+                templateMapper.saveCommonUser(pamp_user);
+                log.info("添加common表："+pamp_user);
+            }else if(gk_userId == -1){ // 需要补齐id
+                log.info("更新common表："+userId+","+gk_userId);
+                templateMapper.updateCommonUser(userId,gk_userId);
+            }
+
         } else {
             orgId = templateMapper.getGeerunnerOrgId(gk_userId);
         }

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -166,10 +166,10 @@
         <c:when test="${yfb}">
             <li id="base" style="display: none;"></li>
             <ul class="yfb" style="padding: 20px 0px;height: 460px;">
-                <li class="road menu-sub-item">
-                    <a href="/easy/road/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
+                <li class="data menu-sub-item">
+                    <a href="/easy/data/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
-                        <span class="menu-txt">路线导入</span>
+                        <span class="menu-txt">数据统计</span>
                     </a>
                 </li>
                 <li class="review menu-sub-item">
@@ -178,10 +178,10 @@
                         <span class="menu-txt">成绩管理</span>
                     </a>
                 </li>
-                <li class="data menu-sub-item">
-                    <a href="/easy/data/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
+                <li class="road menu-sub-item">
+                    <a href="/easy/road/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
-                        <span class="menu-txt">成绩统计</span>
+                        <span class="menu-txt">路线导入</span>
                     </a>
                 </li>
                 <li class="menu-sub-item">