albertshaw 8 years ago
parent
commit
60b9d1776a

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -55,7 +55,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			return res;
 		}
 		User curUser = userService.selectByPrimaryKey(inputInfo.getUid());
-		if (checkCertify(res, curUser)) {
+		if (!checkCertify(res, curUser)) {
 			return res;
 		}
 		CopyrightInfo ci = new CopyrightInfo();

+ 2 - 2
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -33,7 +33,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <select id="findByPrimaryKey" parameterType="java.lang.String" resultType="com.goafanti.copyright.bo.CopyrightInfoDetail">
-    select ci.id,ci.serial_number as serialNumber, ci.create_time as createTime, 
+    select ci.id,ci.uid,ci.serial_number as serialNumber, ci.create_time as createTime, 
 	ci.accept_time as acceptTime, ci.contact, ci.copyright_name as copyrightName, 
 	ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, ci.authorized_date as authorizedDate, 
 	ci.work_issue as workIssue,ci.application_url as applicationUrl,ci.certificate_url as certificateUrl,
@@ -264,7 +264,7 @@
   </update>
   
   <select id="findListByPage" resultType="com.goafanti.copyright.bo.CopyrightInfoSummary"  parameterType="String">
-  	select ci.id,ci.serial_number as serialNumber, ci.create_time as createTime, 
+  	select ci.id,ci.uid,ci.serial_number as serialNumber, ci.create_time as createTime, 
 	ci.accept_time as acceptTime, ci.contact,
 	ci.copyright_name as copyrightName, ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, 
 	ci.authorized_date as authorizedDate, ci.work_issue as workIssue,

+ 19 - 0
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -68,4 +68,23 @@
       name = #{name,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="findPermissionByUserId" parameterType="java.lang.String" resultType="java.lang.String">
+    select tp.url
+    from permission tp
+    left join role_permission trp on tp.id=trp.pid
+    left join user_role tur on tur.rid=trp.rid
+    where tur.uid = #{userId,jdbcType=VARCHAR}
+  </select>
+  <select id="findAll" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from permission
+  </select>
+  <delete id="deleteByPrimaryKeys" parameterType="java.lang.String">
+    delete from permission
+    where id in 
+    <foreach item="item" index="index" collection="list" open="(" separator="," close=")">  
+	  #{item,jdbcType=VARCHAR}  
+    </foreach>
+  </delete>
 </mapper>

+ 3 - 3
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -78,14 +78,14 @@
 	    name = values(name)
   </insert>
   <select id="findRolePermissions" resultType="com.goafanti.permission.bo.RolePermissionBo">
-    select tr.id as rid, tr.name as rname, tr.type,tp.id as pid,tp.name as pname,tp.url
+    select tr.id as rid, tr.role_name as rname, tr.role_type,tp.id as pid,tp.name as pname,tp.url
     from role tr
     left join role_permission trp on trp.rid=tr.id
     left join permission tp on tp.id=trp.pid
-    where tr.type <![CDATA[ < ]]> 999999
+    where tr.role_type <![CDATA[ < ]]> 999999
   </select>
   <select id="findRoleByUserId" resultType="java.lang.String">
-    select tr.type from role tr
+    select tr.role_type from role tr
     left join user_role tur on tur.rid=tr.id
     where tur.uid = #{userId,jdbcType=VARCHAR}
   </select>

+ 10 - 0
src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java

@@ -10,6 +10,8 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 public class CopyrightInfoSummary {
 
 	private String	id;
+	
+	private String	uid;
 	/**
 	 * 省份
 	 */
@@ -267,4 +269,12 @@ public class CopyrightInfoSummary {
 		this.workIssue = workIssue;
 	}
 
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
 }