ソースを参照

Accept Merge Request #101 mege : (master -> test)

Merge Request: mege
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/101
Antiloveg 9 年 前
コミット
b30091ab3f
共有2 個のファイルを変更した3 個の追加2 個の削除を含む
  1. 3 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  2. 0 1
      src/main/webapp/WEB-INF/views/header.jsp

+ 3 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgCognizanceLogMapper;
 import com.goafanti.common.dao.OrgCognizanceMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrgCognizanceStatus;
 import com.goafanti.common.model.Admin;
@@ -223,6 +224,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	@Override
 	public void insertCognizance(OrgCognizance c, String aid) {
 		c.setId(UUID.randomUUID().toString());
+		c.setState(CopyrightStatus.CREATE.getCode());
 		c.setDeletedSign(0);
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
@@ -235,7 +237,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 		log.setRecordTime(c.getCreateTime());
 		log.setState(c.getState());
-		log.setPrincipal(StringUtils.isBlank(aid) && TokenManager.getToken() instanceof Admin? TokenManager.getAdminId() : "");
+		log.setPrincipal(aid);
 		if (TokenManager.getToken() instanceof Admin) {
 			log.setOperator(TokenManager.getAdminId());
 		}

+ 0 - 1
src/main/webapp/WEB-INF/views/header.jsp

@@ -57,7 +57,6 @@
 	window.showAchievement = true;
 	window.showDemand = true;
 	window.showIdea = true;
-	window.showCustomer = true;
 	</shiro:hasRole>
 
 	<shiro:hasPermission name="userManage">