|
|
@@ -553,9 +553,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public Object getMyNewPublic() {
|
|
|
- List<OutPublicReleaseList> myPublic = getMyPublic(0,1,1);
|
|
|
+ List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
|
|
|
if (myPublic.isEmpty()){
|
|
|
- List<OutPublicReleaseList> myPublic2 = getMyPublic(0,1,0);
|
|
|
+ List<OutPublicReleaseList> myPublic2 = getMyPublic(0,0);
|
|
|
if (!myPublic2.isEmpty()){
|
|
|
return myPublic2.get(0);
|
|
|
}
|
|
|
@@ -569,11 +569,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
/**
|
|
|
*
|
|
|
* @param type 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部)
|
|
|
- * @param assist 0主协单 1子协单
|
|
|
* @param dateType 是否含打卡时间 0否 1是
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<OutPublicReleaseList>getMyPublic(Integer type,Integer assist,Integer dateType){
|
|
|
+ public List<OutPublicReleaseList>getMyPublic(Integer type ,Integer dateType){
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
if (type==null)type=0;
|
|
|
map.put("type",type);
|
|
|
@@ -582,7 +581,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String clockTime=DateUtils.formatDate(date,AFTConstants.YYYYMMDDHHMMSS);
|
|
|
map.put("clockTime",clockTime);
|
|
|
}
|
|
|
- if (assist!=null)map.put("assist",assist);
|
|
|
+ map.put("assistType",1);
|
|
|
map.put("aid",TokenManager.getAdminId());
|
|
|
List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) findList("listPublicRelease",map,1,1);
|
|
|
return list;
|