no message

doc/sql/update.sql

@@ -8,4 +8,7 @@ ALTER TABLE `platform_auth`.`platform_applications`
     ADD COLUMN `group_code` varchar(20) NULL COMMENT '分组编码' AFTER `mailtype`;
 
 ALTER TABLE `platform_auth`.`platform_applications`
-    ADD COLUMN `wechat_url` varchar(255) NULL COMMENT '企业微信入口' AFTER `group_code`;
+    ADD COLUMN `wechat_url` varchar(255) NULL COMMENT '企业微信入口' AFTER `group_code`;
\ No newline at end of file
+
+ALTER TABLE `platform_applications`
+    ADD COLUMN `app_enable` varchar(20) NOT NULL DEFAULT 1 COMMENT '应用启用/停用：1=启用，0=停用';
\ No newline at end of file

src/main/java/com/metro/auth/platform/domain/auth/PlatformApplications.java

@@ -118,6 +118,19 @@ public class PlatformApplications implements Serializable {
         this.num = num;
     }
 
+    /**
+     * 应用启用/停用：'1'=启用，'0'=停用
+     */
+    private String appEnable;
+
+    public String getAppEnable() {
+        return appEnable;
+    }
+
+    public void setAppEnable(String appEnable) {
+        this.appEnable = appEnable;
+    }
+
     public String getWechatUrl() {
         return wechatUrl;
     }

src/main/java/com/metro/auth/platform/mapper/PlatformApplicationsMapper.xml

@@ -16,6 +16,7 @@
         <result column="mailtype" jdbcType="VARCHAR" property="mailtype"/>
         <result column="group_code" jdbcType="VARCHAR" property="groupCode"/>
         <result column="wechat_url" jdbcType="VARCHAR" property="wechatUrl"/>
+        <result column="app_enable" jdbcType="VARCHAR" property="appEnable"/>
     </resultMap>
 
 
@@ -106,7 +107,7 @@
     </sql>
     <sql id="Base_Column_List">
         id, title, img, href, addtime, tishi, databasename, databasepassword, databasecon, qyflag, appid, secret,
-        openmail, mailtype, group_code, wechat_url, num
+        openmail, mailtype, group_code, wechat_url, app_enable, num
     </sql>
     <select id="selectByExample" parameterType="com.metro.auth.platform.domain.auth.PlatformApplicationsExample"
             resultMap="BaseResultMap">
@@ -120,7 +121,7 @@
             <include refid="Example_Where_Clause"/>
         </if>
         <if test="orderByClause != null">
-            order by ${orderByClause}
+            order by ${orderByClause} + 0
         </if>
     </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -155,14 +156,14 @@
         insert into platform_applications (id, title, img,
         href, addtime, tishi,databasename,databasepassword,
         databasecon,qyflag,appid,secret,openmail,mailtype,
-        group_code, wechat_url
+        group_code, wechat_url, app_enable
         )
         values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR},
         #{href,jdbcType=VARCHAR}, #{addtime,jdbcType=VARCHAR}, #{tishi,jdbcType=INTEGER},
         #{databasename,jdbcType=VARCHAR}, #{databasepassword,jdbcType=VARCHAR}, #{databasecon,jdbcType=VARCHAR},
         #{qyflag,jdbcType=VARCHAR},
         #{appid,jdbcType=VARCHAR},#{secret,jdbcType=VARCHAR},#{openmail,jdbcType=INTEGER},
-        #{mailtype,jdbcType=VARCHAR},#{groupCode,jdbcType=VARCHAR}, #{wechatUrl,jdbcType=VARCHAR}
+        #{mailtype,jdbcType=VARCHAR},#{groupCode,jdbcType=VARCHAR}, #{wechatUrl,jdbcType=VARCHAR}, #{appEnable,jdbcType=VARCHAR}
         )
     </insert>
     <insert id="insertSelective" parameterType="com.metro.auth.platform.domain.auth.PlatformApplications">
@@ -186,6 +187,9 @@
             <if test="tishi != null">
                 tishi,
             </if>
+            <if test="appEnable != null">
+                app_enable,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -206,6 +210,9 @@
             <if test="tishi != null">
                 #{tishi,jdbcType=INTEGER},
             </if>
+            <if test="appEnable != null">
+                #{appEnable,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.metro.auth.platform.domain.auth.PlatformApplicationsExample"
@@ -250,6 +257,9 @@
             <if test="record.mailtype != null">
                 mailtype = #{record.mailtype,jdbcType=VARCHAR},
             </if>
+            <if test="record.appEnable != null">
+                app_enable = #{record.appEnable,jdbcType=VARCHAR},
+            </if>
         </set>
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause"/>
@@ -276,7 +286,8 @@
         openmail = #{record.openmail,jdbcType=INTEGER},
         mailtype = #{record.mailtype,jdbcType=VARCHAR},
         group_code = #{record.groupCode,jdbcType=VARCHAR},
-        wechat_url = #{record.wechatUrl,jdbcType=VARCHAR}
+        wechat_url = #{record.wechatUrl,jdbcType=VARCHAR},
+        app_enable = #{record.appEnable,jdbcType=VARCHAR}
 
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause"/>
@@ -304,6 +315,9 @@
             <if test="tishi != null">
                 tishi = #{tishi,jdbcType=INTEGER},
             </if>
+            <if test="appEnable != null">
+                app_enable = #{appEnable,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -317,7 +331,8 @@
         img = #{img,jdbcType=VARCHAR},
         href = #{href,jdbcType=VARCHAR},
         addtime = #{addtime,jdbcType=VARCHAR},
-        tishi = #{tishi,jdbcType=INTEGER}
+        tishi = #{tishi,jdbcType=INTEGER},
+        app_enable = #{appEnable,jdbcType=VARCHAR}
         where id = #{id,jdbcType=INTEGER}
     </update>
 
@@ -334,7 +349,7 @@
 
     <select id="getPlatformApplicationsListByRole" parameterType="java.lang.String" resultMap="BaseResultMap">
         select distinct T.* from platform_applications T left join platform_role_application R on T.id=R.applicationid
-        where T.qyflag='1' and R.roleid = #{roleid,jdbcType=VARCHAR} order by T.num + 0 desc
+        where T.qyflag='1' and R.roleid = #{roleid,jdbcType=VARCHAR} order by T.num + 0
     </select>
     <select id="getPlatformApplicationsListByRoleList" resultMap="BaseResultMap">
         select distinct T.* from platform_applications T left join platform_role_application R on T.id=R.applicationid

src/main/java/com/metro/auth/platform/mapper/TodoMapper.xml

@@ -184,13 +184,11 @@
   </update>
 
   <select id="countByaccount" parameterType="java.lang.String" resultType="com.metro.auth.platform.domain.dto.TodoNumDTO">
-    SELECT A.title typename,A.mailtype type,IFNULL(B.num,'0') num,B.account FROM
-    platform_applications A
+    SELECT A.title typename, A.mailtype type, IFNULL(B.num,'0') num, B.account
+    FROM platform_applications A
      LEFT JOIN ( SELECT count(1) num, type , account FROM  platform_todo WHERE account=#{account,jdbcType=VARCHAR} and status='0' group by type,account ) B
     ON A.mailtype = B.type
-    where
-        A.qyflag  = '1'
-    and A.openmail = 1
+    where A.qyflag  = '1' and A.openmail = 1 and A.mailtype is not null and A.mailtype &lt;&gt; ''
     order  by  A.mailtype asc
   </select>
 

src/main/java/com/metro/auth/platform/service/PlatformApplicationsServiceImpl.java

@@ -82,7 +82,6 @@ public class PlatformApplicationsServiceImpl implements PlatformApplicationsServ
         int count = platformApplicationsMapper.deleteByPrimaryKey(id);
         return count;
     }
-
     @Override
     public List<PlatformApplications> getPlatformApplicationsList() {
         return platformApplicationsMapper.getPlatformApplicationsList();