Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sql/20191230.sql

sql/20191230.sql

@@ -1,4 +1,7 @@
 ALTER TABLE ac_activity_registration ADD sign_time datetime DEFAULT NULL COMMENT '签到时间' AFTER review_state
-ALTER TABLE ac_activity_detail ADD lat_lng varchar(255) DEFAULT NULL COMMENT '活动地址坐标' AFTER activity_location
+
 ALTER TABLE ac_activity_registration ADD company_name  varchar(255) DEFAULT NULL COMMENT '公司名称' AFTER company_id
-ALTER TABLE ac_activity_registration ADD industry_name varchar(255) DEFAULT NULL COMMENT '行业名称' AFTER company_id
+
+ALTER TABLE ac_activity_registration ADD industry_name varchar(255) DEFAULT NULL COMMENT '行业名称' AFTER company_id
+
+ALTER TABLE ac_activity_detail ADD lat_lng varchar(255) DEFAULT NULL COMMENT '活动地址坐标' AFTER activity_location

src/main/java/platform/modules/sys/service/ActivityService.java

@@ -634,7 +634,10 @@ public class ActivityService extends BaseService<ActivityDetail> {
      **/
     public InputStream getQRcode(String type, String width, String scene) {
 
-        String access_token = JSON.parseObject(WxAppUtil.getAccessToken(APP_ID, APP_SERCRET)).getString("access_token");
+        String obj = WxAppUtil.getAccessToken(APP_ID, APP_SERCRET);
+        System.out.println("access_token:" + obj);
+        String access_token = JSON.parseObject(obj).getString("access_token");
+
         String path = "";
         InputStream is = null;
         try {

src/main/resources/mapper/sys/ActivityRegistrationDao.xml

@@ -59,7 +59,7 @@
             UNION
             SELECT
                 z.id id,
-                '政府' name,
+                s.name name,
                 '0' type
             FROM
                 sys_department s
@@ -131,12 +131,19 @@
             UNION
             SELECT
                 z.id id,
-                '政府' name,
+                s.name name,
                 '0' type
             FROM
                 sys_department s
             JOIN z_user z ON z.department_id = s.id
             UNION
+            SELECT
+                id,
+                '个人' name,
+                '5' type
+            FROM
+                z_user u
+            UNION
             SELECT
                 z.id id,
                 a.company_name name,
@@ -367,7 +374,7 @@
             UNION
             SELECT
                 z.id id,
-                '政府' name,
+                s.name name,
                 '0' type
             FROM
                 sys_department s

src/main/resources/mapper/sys/ActivityReviewDao.xml

@@ -15,6 +15,7 @@
         <if test="condition.title != null and condition.title != ''">
            and ad.activity_title like concat('%',#{condition.title}, '%')
         </if>
+        order by ad.create_time desc
     </select>
 
     <update id="batchUpdate">