Merge remote-tracking branch 'origin/master'

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -4125,8 +4125,8 @@ public class SubInfoServiceImpl implements SubInfoService {
                 "\t\tFROM\n" +
                 "\t\t\t(\n" +
                 "\t\t\tSELECT\n" +
-                "\t\t\t\tsub_unit_id,\n" +
-                "\t\t\t\tsub_id \n" +
+                "\t\t\t\to.sub_unit_id,\n" +
+                "\t\t\t\to.sub_id \n" +
                 "\t\t\tFROM\n" +
                 "\t\t\t\tsub_pre_new o\n" +
                 "\t\t\t\tLEFT JOIN j_unit u ON o.sub_unit_id = u.id \n" +
@@ -4140,10 +4140,10 @@ public class SubInfoServiceImpl implements SubInfoService {
                 "\t\tAND DATE_FORMAT( o.date_plan, \"%Y%m\" )<= \"" + queryVO.getEndDate() + "\" \n" +
                 this.getWhereSql(queryVO) +
                 "\t\t\tGROUP BY\n" +
-                "\t\t\t\tsub_id,\n" +
-                "\t\t\t\tsub_unit_id \n" +
+                "\t\t\t\to.sub_id,\n" +
+                "\t\t\t\to.sub_unit_id \n" +
                 "\t\t\tORDER BY\n" +
-                "\t\t\t\tsub_id \n" +
+                "\t\t\t\to.sub_id \n" +
                 "\t\t\t) a \n" +
                 "\t\t) departNum \n" +
                 "\tFROM\n" +

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -148,32 +148,32 @@
                         <%--                            url: 'subject/subInfo/projZj?code=${li.code}&title=${li.title}',--%>
                         <%--                        },--%>
                         <%--                        </c:forEach>--%>
-                        <c:forEach items="${zjlyList}" var="li" varStatus="lis">
-                        <c:choose>
-                        <c:when test="${li.code == '1999' && li.title == '重点投资项目'}">
-                        {
-                            txt: '重点投资项目',
-                            code: '1999',
-                            url: 'subject/subInfo/projTz?type=major',
-                        },
-                        </c:when>
-                        <c:when test="${li.code == '104' && li.title == '援疆资金'}">
-                        {
-                            txt: '${li.title}',
-                            code: '${li.code}',
-                            url: 'non/fixed/investment/yjzj',
-                        },
-                        </c:when>
-                        <c:otherwise>
-                        {
-                            txt: '${li.title}',
-                            code: '${li.code}',
-                            /*                     url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}',*/
-                            url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}&statusZj=1',
-                        },
-                        </c:otherwise>
-                        </c:choose>
-                        </c:forEach>
+<%--                        <c:forEach items="${zjlyList}" var="li" varStatus="lis">--%>
+<%--                        <c:choose>--%>
+<%--                        <c:when test="${li.code == '1999' && li.title == '重点投资项目'}">--%>
+<%--                        {--%>
+<%--                            txt: '重点投资项目',--%>
+<%--                            code: '1999',--%>
+<%--                            url: 'subject/subInfo/projTz?type=major',--%>
+<%--                        },--%>
+<%--                        </c:when>--%>
+<%--                        <c:when test="${li.code == '104' && li.title == '援疆资金'}">--%>
+<%--                        {--%>
+<%--                            txt: '${li.title}',--%>
+<%--                            code: '${li.code}',--%>
+<%--                            url: 'non/fixed/investment/yjzj',--%>
+<%--                        },--%>
+<%--                        </c:when>--%>
+<%--                        <c:otherwise>--%>
+<%--                        {--%>
+<%--                            txt: '${li.title}',--%>
+<%--                            code: '${li.code}',--%>
+<%--                            /*                     url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}',*/--%>
+<%--                            url: 'subject/subInfo/projZjTab?code=${li.code}&title=${li.title}&statusZj=1',--%>
+<%--                        },--%>
+<%--                        </c:otherwise>--%>
+<%--                        </c:choose>--%>
+<%--                        </c:forEach>--%>
                         /*            {
                                         txt: '重点投资项目',
                                         code: '404',
@@ -228,16 +228,16 @@
                             code: '301',
                             url: 'subject/subInfo/report'
                         },
-                        {
-                            txt: '项目审核',
-                            code: '302',
-                            url: 'subject/apply/spList'/* ?type=qx */
-                        },
-                        {
-                            code: '304',
-                            txt: '前期手续办理情况评价',
-                            url: 'subject/subInfo/projTz?type=prePj',
-                        },
+                        // {
+                        //     txt: '项目审核',
+                        //     code: '302',
+                        //     url: 'subject/apply/spList'/* ?type=qx */
+                        // },
+                        // {
+                        //     code: '304',
+                        //     txt: '前期手续办理情况评价',
+                        //     url: 'subject/subInfo/projTz?type=prePj',
+                        // },
                         {
                             txt: '前期手续办理情况',
                             code: '303',