Просмотр исходного кода

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb лет назад: 8
Родитель
Сommit
8749468740

+ 10 - 8
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -82,14 +82,14 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName, 	Integer locationProvince, Integer pageNo,
-			Integer pageSize) {
+	public Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName,
+			Integer locationProvince, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
 		if (TokenManager.getToken() instanceof Admin && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		
+
 		if (!StringUtils.isBlank(contractId)) {
 			params.put("contractId", contractId);
 		}
@@ -222,7 +222,8 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@Override
 	public void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid) {
-		if (null != log.getState() && null != recordTime && null != cog.getUid() && null != log.getPrincipal()) {
+		if (null != log.getState() && null != recordTime && StringUtils.isNotBlank(cog.getUid())
+				&& StringUtils.isNotBlank(log.getPrincipal())) {
 			log.setRecordTime(recordTime);
 			cog.setTechPrincipal(log.getPrincipal());
 			OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(cog.getUid());
@@ -236,8 +237,9 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 				o.setCertificateNumber(null == cog.getCertificateNumber() ? "" : cog.getCertificateNumber());
 				o.setIssuingDate(recordTime);
 				o.setCogContacts(null == cog.getContacts() ? null : cog.getContacts());
+				organizationIdentityMapper.updateByPrimaryKeySelective(o);
 			}
-			organizationIdentityMapper.updateByPrimaryKeySelective(o);
+
 			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.CIRCULATION) {
 				cog.setState(OrgCognizanceStatus.DELIVERD.getCode());
 			}
@@ -441,7 +443,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		oc.setRecordTime(now.getTime());
-		
+
 		OrgCognizanceLog ocl = new OrgCognizanceLog();
 		ocl.setId(UUID.randomUUID().toString());
 		ocl.setCid(oc.getId());
@@ -449,10 +451,10 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		ocl.setOperator(TokenManager.getAdminId());
 		ocl.setRecordTime(now.getTime());
 		ocl.setState(OrgCognizanceStatus.CREATE.getCode());
-		
+
 		orgCognizanceMapper.insert(oc);
 		orgCognizanceLogMapper.insert(ocl);
-		
+
 		c.setCognizanceStatus(ContractBusinessStatus.CREATE.getCode());
 		contractMapper.updateByPrimaryKeySelective(c);
 	}

+ 6 - 6
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html

@@ -306,7 +306,7 @@
 			<ul>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_1.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_1.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>
@@ -319,7 +319,7 @@
 				</li>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_2.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_2.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>
@@ -332,7 +332,7 @@
 				</li>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_3.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_3.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>
@@ -345,7 +345,7 @@
 				</li>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_4.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_4.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>
@@ -358,7 +358,7 @@
 				</li>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_5.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_5.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>
@@ -371,7 +371,7 @@
 				</li>
 				<li>
 					<div class="expert_content_img">
-						<img th:src="${portalHost + '/img/star_img_6.png'}"> <span
+						<img th:src="${portalHost + '/img/act_star_img_6.png'}"> <span
 							class="sp1"> <span class="sp2"></span>
 						</span>
 					</div>